--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -165,13 +165,11 @@
     _LIT_SECURITY_POLICY_PASS(KRdPolicy); // all pass
     _LIT_SECURITY_POLICY_S0(KWrPolicy, KHbPsForegroundAppOrientationCategoryUid.iUid); // pass device dialog server    
     
-    int error = mHbOriProperty.Define(KHbPsForegroundAppOrientationCategoryUid,
-                                      KHbPsForegroundAppOrientationKey,
-                                      RProperty::EInt, KRdPolicy, KWrPolicy);
-    if (error == KErrNone) {
-        mHbOriProperty.Attach(KHbPsForegroundAppOrientationCategoryUid,
-                              KHbPsForegroundAppOrientationKey);
-    }
+    mHbOriProperty.Define(KHbPsForegroundAppOrientationCategoryUid,
+                          KHbPsForegroundAppOrientationKey,
+                          RProperty::EInt, KRdPolicy, KWrPolicy);
+    mHbOriProperty.Attach(KHbPsForegroundAppOrientationCategoryUid,
+                          KHbPsForegroundAppOrientationKey);
 #endif        
     TRACE_EXIT
 }
@@ -183,7 +181,9 @@
 HbDeviceDialogManagerPrivate::~HbDeviceDialogManagerPrivate()
 {
     TRACE_ENTRY
-    killTimer(mHousekeeperTimerId);
+    if (mHousekeeperTimerId) {
+        killTimer(mHousekeeperTimerId);
+    }
 #if defined(Q_OS_SYMBIAN)
     mScene->removeItem(&mMousePressCatcher);
     mWindowRegion.Close();