diff -r 5944cae565c9 -r 9c303455e256 supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp --- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp Tue May 11 16:36:36 2010 +0300 +++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp Tue May 25 13:09:42 2010 +0300 @@ -106,13 +106,21 @@ { iSettingsLauncher->CancelLaunch(); } - iSuplSettings->SetUIActive( EFalse ); + + if(iSuplSettings) + { + iSuplSettings->SetUIActive( EFalse ); + } DeleteAllSessions(); iSuplSessions.Reset(); iSuplSessions.Close(); - iTelServer.UnloadPhoneModule(iTsyName); + //Only attempt to unload the phone if the TSY has actually been initialised + if(iTsyName.Length() > 0) + { + iTelServer.UnloadPhoneModule(iTsyName); + } iQueuedPacket.Close();