diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/src/net/torvald/terrarum/AppLoader.java b/src/net/torvald/terrarum/AppLoader.java
index 892d0bb4c..0f233bd15 100644
--- a/src/net/torvald/terrarum/AppLoader.java
+++ b/src/net/torvald/terrarum/AppLoader.java
@@ -335,7 +335,12 @@ public class AppLoader implements ApplicationListener {
             }
 
             // nullify if not actually connected
-            if (!((XinputControllerAdapter) gamepad).getC().isConnected()) {
+            try {
+                if (!((XinputControllerAdapter) gamepad).getC().isConnected()) {
+                    gamepad = null;
+                }
+            }
+            catch (NullPointerException notQuiteWindows) {
                 gamepad = null;
             }
         }
diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt
index f7c23ccd6..ece697eeb 100644
--- a/src/net/torvald/terrarum/TitleScreen.kt
+++ b/src/net/torvald/terrarum/TitleScreen.kt
@@ -220,7 +220,7 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
         // render? just do it anyway
         AppLoader.measureDebugTime("Ingame.render") { renderScreen() }
         AppLoader.setDebugTime("Ingame.render-Light",
-                (AppLoader.debugTimers["Ingame.render"] as Long) - ((AppLoader.debugTimers["Renderer.LightTotal"] as? Long) ?: 0)
+                ((AppLoader.debugTimers["Ingame.render"] as? Long) ?: 0) - ((AppLoader.debugTimers["Renderer.LightTotal"] as? Long) ?: 0)
         )
     }