--- a/gssettingsuis/Gs/GSFramework/src/GSBaseDocument.cpp	Wed Apr 14 16:15:29 2010 +0300
+++ b/gssettingsuis/Gs/GSFramework/src/GSBaseDocument.cpp	Tue Apr 27 16:56:32 2010 +0300
@@ -38,7 +38,8 @@
 //
 EXPORT_C CGSBaseDocument::CGSBaseDocument( CEikApplication& aApp )
 :   CAknDocument( aApp ),
-    iUnloadWrapperObjects( KGSPluginWrapperObjectGranularity )
+    iUnloadWrapperObjects( KGSPluginWrapperObjectGranularity ),
+    iWatchDog ( NULL )
     {
     }
 
@@ -65,7 +66,9 @@
 
     iUnloadWrapperObjects.Close();
     delete iPluginViewIdCache;
+#ifdef GS_ENABLE_WATCH_DOG
     delete iWatchDog;
+#endif
 
     iImplInfoArray.ResetAndDestroy();// This is needed
     iImplInfoArray.Close();
@@ -80,7 +83,9 @@
 //
 EXPORT_C void CGSBaseDocument::ConstructL()
     {
+#ifdef GS_ENABLE_WATCH_DOG
     iWatchDog = CGSWatchDog::NewL();
+#endif
 
     REComSession::ListImplementationsL(
         KGSPluginInterfaceUid,