--- a/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndsystemwideproperty.cpp	Thu Aug 19 11:09:10 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/conditionevaluator/src/cndsystemwideproperty.cpp	Tue Aug 31 16:29:05 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,6 +19,7 @@
  @internalComponent
 */
 
+#include "ssmdebug.h"
 #include "cndsystemwideproperty.h"
 #include <ssm/ssmsystemwideproperty.h>
 
@@ -48,8 +49,9 @@
   
     RSsmSystemWideProperty property;
 	User::LeaveIfError(property.Connect(iKey));
-	User::LeaveIfError(property.GetValue(value));
-	property.Close();
+	CleanupClosePushL(property);
+
+	SSMLOGLEAVEIFERROR(property.GetValue(value));
 	
     TBool retVal = EFalse;
     if (iConditionCheckType == ECompareValue)
@@ -60,5 +62,7 @@
         {
         retVal = ((value & iCndValue) == iCndValue);
         }
+
+	CleanupStack::PopAndDestroy(&property);
     return retVal;
     }