--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp	Fri Feb 19 23:59:33 2010 +0200
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp	Fri Mar 12 15:49:38 2010 +0200
@@ -123,9 +123,7 @@
     TInt err = iFeatureControl.Open();
 	iUsingFeatureManager = (err == KErrNone);
 	
-	//Create the SSM Plugin Handler on creation rather than on demand to avoid problems 
-	//with Emergency Calls in Out Of Memory situations.
-	iSystemStatePluginHandler = CCtsySystemStatePluginHandler::NewL();
+	iSystemStatePluginHandler = iMmCallTsy->Phone()->SystemStatePluginHandler();
 
 	ResetInternalAttributes();
     }
@@ -174,12 +172,6 @@
     iMmCallTsy = NULL;
     iMessageManager = NULL;
     
-    if ( iSystemStatePluginHandler )
-        {
-        delete iSystemStatePluginHandler;
-        }
-    iSystemStatePluginHandler = NULL;
-    
     }
     
 // ---------------------------------------------------------------------------