diff -r 3cebc1a84278 -r 50de4d668bb6 harvester/client/src/harvesterclient.cpp --- a/harvester/client/src/harvesterclient.cpp Mon Mar 15 12:42:24 2010 +0200 +++ b/harvester/client/src/harvesterclient.cpp Wed Mar 31 22:19:07 2010 +0300 @@ -261,9 +261,13 @@ // EXPORT_C TInt RHarvesterClient::RemoveHarvesterEventObserver( MHarvesterEventObserver& aHarvesterEventObserver ) { - TRAPD( err, iHEO->RemoveHarvesterEventObserverL( aHarvesterEventObserver ) ); + if( iHEO ) + { + TRAPD( err, iHEO->RemoveHarvesterEventObserverL( aHarvesterEventObserver ) ); + return err; + } - return err; + return KErrNone; } // ----------------------------------------------------------------------------------------