--- a/mmfenh/audiooutputcontrolutility/AudioOutputControlUtilityProxy/src/AudioOutputControlUtilityProxyImpl.cpp	Fri Apr 30 19:18:45 2010 -0500
+++ b/mmfenh/audiooutputcontrolutility/AudioOutputControlUtilityProxy/src/AudioOutputControlUtilityProxyImpl.cpp	Fri May 14 18:19:45 2010 -0500
@@ -167,6 +167,7 @@
                 CleanupStack::Pop(iAudioOutput);
             else
                 CleanupStack::PopAndDestroy(iAudioOutput);
+                iAudioOutput = NULL;
             }
         return err;
         }
@@ -253,9 +254,12 @@
             {
             //in case of EMC sources
             CleanupStack::PopAndDestroy(iDRMConfigIntfc);
+            iDRMConfigIntfc = NULL;
             }
         CleanupStack::PopAndDestroy(iRestrictedAudioOutput);
         CleanupStack::PopAndDestroy(iFactory);
+        iFactory = NULL;
+        iRestrictedAudioOutput = NULL;
         }
         
     return err;