diff -r aba6b8104af3 -r 84a16765cd86 ncdengine/provider/server/src/ncdloadrootnodeoperationimpl.cpp --- a/ncdengine/provider/server/src/ncdloadrootnodeoperationimpl.cpp Tue Feb 02 00:20:15 2010 +0200 +++ b/ncdengine/provider/server/src/ncdloadrootnodeoperationimpl.cpp Fri Mar 19 09:33:35 2010 +0200 @@ -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"),