diff -r e32024264ebb -r d7fc66ccd6fb satengine/SatServer/Engine/src/CSatCommandContainer.cpp --- a/satengine/SatServer/Engine/src/CSatCommandContainer.cpp Fri Apr 16 15:31:58 2010 +0300 +++ b/satengine/SatServer/Engine/src/CSatCommandContainer.cpp Mon May 03 13:01:45 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "MSatSystemState.h" #include "TSatSystemStateFactory.h" @@ -318,7 +318,10 @@ // to handle client responses. If SAT UI / Proactive command is executing // while Bluetooth SAP is enabled, SAT UI sends ClientResponse and that must // be preveted - iServiceReqs->Reset(); + if ( iServiceReqs ) + { + iServiceReqs->Reset(); + } // Close all reserved BIP Data channels if ( iBipUtils ) @@ -338,7 +341,10 @@ #ifdef SAT_USE_DUMMY_TSY // Close ATSY. This is needed when testin BT SAP in emulator - iUSatAPI->Close(); + if ( iUSatAPI ) + { + iUSatAPI->Close(); + } #endif LOG( NORMAL,