diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
index a7cf88b3..35e20cb7 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
@@ -224,9 +224,16 @@ public class RaceController extends Controller {
         });
 
         racePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
-            switch(keyFactory.getKey(e.getCode().toString()).toString()) {
-                case "Zoom In": view3D.updateDistance(-10); break;
-                case "Zoom Out": view3D.updateDistance(10); break;
+            ControlKey key = keyFactory.getKey(e.getCode().toString());
+            if(key != null) {
+                switch (key.toString()) {
+                    case "Zoom In":
+                        view3D.updateDistance(-10);
+                        break;
+                    case "Zoom Out":
+                        view3D.updateDistance(10);
+                        break;
+                }
             }
         });
     }