--- a/contextengine/plugins/calendarplugin/src/CalendarContextPlugin.cpp	Fri Apr 16 15:23:55 2010 +0300
+++ b/contextengine/plugins/calendarplugin/src/CalendarContextPlugin.cpp	Mon May 03 12:55:01 2010 +0300
@@ -240,6 +240,14 @@
 
 	WRITELOG1( "CCalendarContextPlugin::AddMetaDataL -- instanceCount: %d", instanceCount );
 
+	if( instanceCount == 0 )
+	    {
+        CleanupStack::PopAndDestroy( &instances );
+
+        WRITELOG( "CCalendarContextPlugin::AddMetaDataL - no calendar items found -- RETURN" );	
+        return;
+	    }
+	
 	// required object properties
 	WRITELOG( "CCalendarContextPlugin::AddMetaDataL" );
 	User::LeaveIfNull( iMdeSession );