diff --git a/P3D/Debug/DebugDisplay.vb b/P3D/Debug/DebugDisplay.vb
index 3a118fee0..01ebf71c0 100644
--- a/P3D/Debug/DebugDisplay.vb
+++ b/P3D/Debug/DebugDisplay.vb
@@ -15,16 +15,23 @@
                 ActionscriptActive = CType(Core.CurrentScreen, OverworldScreen).ActionScript.IsReady
             End If
 
-            Dim thirdPersonString As String = ""
-            If Screen.Camera.Name = "Overworld" Then
-                Dim c As OverworldCamera = CType(Screen.Camera, OverworldCamera)
-                If c.ThirdPerson = True Then
-                    thirdPersonString = " / " & c.ThirdPersonOffset.ToString()
+            Dim cameraInformation = ""
+            If Not Screen.Camera Is Nothing Then
+
+                Dim thirdPersonString As String = ""
+                If Screen.Camera.Name = "Overworld" Then
+                    Dim c As OverworldCamera = CType(Screen.Camera, OverworldCamera)
+                    If c.ThirdPerson = True Then
+                        thirdPersonString = " / " & c.ThirdPersonOffset.ToString()
+                    End If
                 End If
+
+                cameraInformation = Screen.Camera.Position.ToString() & thirdPersonString & Environment.NewLine & Screen.Camera.Yaw & "; " & Screen.Camera.Pitch & Environment.NewLine
+
             End If
 
             Dim s As String = GameController.GAMENAME & " " & GameController.GAMEDEVELOPMENTSTAGE & " " & GameController.GAMEVERSION & " / FPS: " & Math.Round(Core.GameInstance.FPSMonitor.Value, 0) & isDebugString & Environment.NewLine &
-                Screen.Camera.Position.ToString() & thirdPersonString & Environment.NewLine & Screen.Camera.Yaw & "; " & Screen.Camera.Pitch & Environment.NewLine &
+                cameraInformation &
                 "E: " & _drawnVertices.ToString() & "/" & _maxVertices.ToString() & Environment.NewLine &
                 "C: " & _maxDistance.ToString() & " A: " & ActionscriptActive.ToString()
 
diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe
index 7cb7f1bcd..8bc43f012 100644
Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ