diff --git a/client/js/KeyboardManager.js b/client/js/KeyboardManager.js
index <HASH>..<HASH> 100644
--- a/client/js/KeyboardManager.js
+++ b/client/js/KeyboardManager.js
@@ -103,11 +103,13 @@ define(['logManager'], function (logManager) {
         if (this._listener !== l) {
             this._listener = l;
 
-            if (!this._listener.onKeyDown) {
-                this._logger.warning('Listener is missing "onKeyDown"...');
-            }
-            if (!this._listener.onKeyUp) {
-                this._logger.warning('Listener is missing "onKeyUp"...');
+            if (this._listener) {
+                if (!this._listener.onKeyDown) {
+                    this._logger.warning('Listener is missing "onKeyDown"...');
+                }
+                if (!this._listener.onKeyUp) {
+                    this._logger.warning('Listener is missing "onKeyUp"...');
+                }
             }
         }
     };
bugfix: don't call method on undefined listener

Former-commit-id: e<I>b<I>d5e<I>b9f6e<I>ecf<I>bd5f<I>c3d<I>adf