--- a/calendarui/controller/src/calencontextfwlistener.cpp	Fri Mar 12 15:42:35 2010 +0200
+++ b/calendarui/controller/src/calencontextfwlistener.cpp	Mon Mar 15 12:40:18 2010 +0200
@@ -216,13 +216,16 @@
     {
     TRACE_ENTRY_POINT;
     CCFContextObject* co = CCFContextObject::NewLC( aSource, aType, aValue );
-
-    const TInt err = iCFClient->PublishContext( *co );
-    CleanupStack::PopAndDestroy( co );
+    if(iCFClient)
+      {
+        const TInt err = iCFClient->PublishContext( *co );
+        
 #ifdef _DEBUG
     RDebug::Print( _L("### PublishContext - err: %d"), err );
 #endif
     User::LeaveIfError( err );
+      }
+    CleanupStack::PopAndDestroy( co );
     TRACE_EXIT_POINT;
     }