diff -r a0713522ab97 -r b276298d5729 contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp Wed Apr 14 16:16:44 2010 +0300 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp Tue Apr 27 16:57:49 2010 +0300 @@ -331,11 +331,13 @@ { CP_DEBUG( _L8("CCPDataManager::RemoveObserver()") ); TInt index = iNotificationsArray.Find( aNotificationHandler ); - __ASSERT_DEBUG( index >= 0 , User::Panic( _L("cpserver"), 0 ) ); - iNotificationsArray.Remove( index ); - if ( iNotificationsArray.Count( ) == 0 ) + if (index != KErrNotFound) { - iStorage->SetCallback( 0 ); + iNotificationsArray.Remove( index ); + if ( iNotificationsArray.Count( ) == 0 ) + { + iStorage->SetCallback( 0 ); + } } }