diff --git a/engine/src/core/com/jme3/app/FlyCamAppState.java b/engine/src/core/com/jme3/app/FlyCamAppState.java
index 5a7b11e95..11d3e3fa2 100644
--- a/engine/src/core/com/jme3/app/FlyCamAppState.java
+++ b/engine/src/core/com/jme3/app/FlyCamAppState.java
@@ -87,7 +87,9 @@ public class FlyCamAppState extends AbstractAppState {
     public void cleanup() {
         super.cleanup();
 
-        flyCam.unregisterInput();        
+        if (app.getInputManager() != null) {        
+            flyCam.unregisterInput();
+        }        
     }