--- a/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp	Tue Aug 31 16:29:05 2010 +0300
+++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp	Wed Sep 01 12:34:26 2010 +0100
@@ -166,13 +166,10 @@
     delete iPowerService;
     iPowerService = NULL;
     
-    if (iMaxReportingPeriodNotifyHandler)
-    	{
-	    iMaxReportingPeriodNotifyHandler->StopListening();
-	    delete iMaxReportingPeriodNotifyHandler;
-	    iMaxReportingPeriodNotifyHandler =  NULL;
-    	}
-    	
+    iMaxReportingPeriodNotifyHandler->StopListening();
+    delete iMaxReportingPeriodNotifyHandler;
+    iMaxReportingPeriodNotifyHandler =  NULL;
+
     delete iRepository;  
     iRepository = NULL;