--- a/metadataengine/server/src/mdsfindsqlclause.cpp	Fri Mar 19 09:38:01 2010 +0200
+++ b/metadataengine/server/src/mdsfindsqlclause.cpp	Fri Apr 16 15:23:55 2010 +0300
@@ -266,7 +266,7 @@
 			{
 			TDefId objectDefId;
 			iSerializedBuffer->ReceiveL( objectDefId );			
-			iSourceObjectDefs->Append( objectDefId );
+			iSourceObjectDefs->AppendL( objectDefId );
 			}
 		}
 	else
@@ -558,6 +558,11 @@
 		{
 		// No property filters so get all properties
 		
+	    if( !iObjectDef )
+	        {
+	        User::Leave( KErrMdEUnknownObjectDef );
+	        }
+	
 		// "SELECT BO.* "
 		iQueryBuf->AppendL( KSelectAllFromBaseObject );