diff --git a/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRActivity.java b/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRActivity.java
index <HASH>..<HASH> 100644
--- a/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRActivity.java
+++ b/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRActivity.java
@@ -220,7 +220,7 @@ public class GVRActivity extends Activity implements IEventReceiver, IScriptable
             mDockEventReceiver.stop();
         }
 
-        if (!mConfigurationManager.isDockListenerRequired()) {
+        if (null != mConfigurationManager && !mConfigurationManager.isDockListenerRequired()) {
             handleOnUndock();
         }
framework: fix an unlikely NPE in GVRActivity.onDestroy (#<I>)