diff -r 61516c5786af -r 00076e39386f resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp --- a/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp Wed Jun 23 22:58:50 2010 +0100 +++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp Thu Jul 22 16:45:41 2010 +0100 @@ -166,10 +166,13 @@ delete iPowerService; iPowerService = NULL; - iMaxReportingPeriodNotifyHandler->StopListening(); - delete iMaxReportingPeriodNotifyHandler; - iMaxReportingPeriodNotifyHandler = NULL; - + if (iMaxReportingPeriodNotifyHandler) + { + iMaxReportingPeriodNotifyHandler->StopListening(); + delete iMaxReportingPeriodNotifyHandler; + iMaxReportingPeriodNotifyHandler = NULL; + } + delete iRepository; iRepository = NULL;