diff -r f392bfb21e08 -r 9941bcf99348 gssettingsuis/Gs/GSApplication/Src/GSUi.cpp
--- a/gssettingsuis/Gs/GSApplication/Src/GSUi.cpp	Wed Apr 14 16:15:29 2010 +0300
+++ b/gssettingsuis/Gs/GSApplication/Src/GSUi.cpp	Tue Apr 27 16:56:32 2010 +0300
@@ -179,15 +179,11 @@
     switch ( aCommand )
         {
         case EEikCmdExit:
-            GSDocument().WatchDog()->ReportCleanExitL();
-            Exit();
-            break;
         case EAknCmdExit:
+        case EAknSoftkeyExit:
+        #ifdef GS_ENABLE_WATCH_DOG
             GSDocument().WatchDog()->ReportCleanExitL();
-            Exit();
-            break;
-        case EAknSoftkeyExit:
-            GSDocument().WatchDog()->ReportCleanExitL();
+        #endif
             Exit();
             break;
         default:
@@ -308,7 +304,9 @@
                 new( ELeave ) CAknInformationNote( ETrue );
     note->ExecuteLD( *prompt );
     CleanupStack::PopAndDestroy( prompt );
+#ifdef GS_ENABLE_WATCH_DOG
     GSDocument().WatchDog()->ReportCleanExitL();
+#endif
     Exit();
     }
 
@@ -423,7 +421,9 @@
         {
         case MGSEComObserver::EPluginRemoved:
             __GSLOGSTRING( "[CGSUi::HandleAppListEvent] Closing GS..." );
-            TRAP_IGNORE( GSDocument().WatchDog()->ReportCleanExitL() );
+            #ifdef GS_ENABLE_WATCH_DOG
+                TRAP_IGNORE( GSDocument().WatchDog()->ReportCleanExitL() );
+            #endif
             Exit();
             break;
         default: