diff -r 5cc91383ab1e -r 7333d7932ef7 ncdengine/provider/server/src/ncdloadrootnodeoperationimpl.cpp --- a/ncdengine/provider/server/src/ncdloadrootnodeoperationimpl.cpp Thu Aug 19 10:02:49 2010 +0300 +++ b/ncdengine/provider/server/src/ncdloadrootnodeoperationimpl.cpp Tue Aug 31 15:21:33 2010 +0300 @@ -1018,6 +1018,11 @@ // Create folder for catalog bundle. DASSERT( bundleId ); + if (!bundleId) + { + User::Leave(KErrNotFound); + } + CNcdNodeIdentifier* metaDataId = CNcdNodeIdentifier::NewLC( aDetail.Value(), *bundleId, iPendingMessage->Session().Context().FamilyId() ); DLINFO((_L("Bundle metaid ns: %S, id: %S"),