diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt
index 4a963c54b..18a674cf9 100644
--- a/src/net/torvald/terrarum/Terrarum.kt
+++ b/src/net/torvald/terrarum/Terrarum.kt
@@ -89,8 +89,10 @@ constructor(gamename: String) : StateBasedGame(gamename) {
         try {
             hasController = gc.input.controllerCount > 0
 
-            // check if the first controller is actually available
-            Controllers.getController(0).getAxisValue(0)
+            if (hasController) {
+                // check if the first controller is actually available
+                Controllers.getController(0).getAxisValue(0)
+            }
         }
         catch (e: ArrayIndexOutOfBoundsException) {
             hasController = false
diff --git a/src/net/torvald/terrarum/console/GetAV.kt b/src/net/torvald/terrarum/console/GetAV.kt
index 8160ccc73..b74ff7cdd 100644
--- a/src/net/torvald/terrarum/console/GetAV.kt
+++ b/src/net/torvald/terrarum/console/GetAV.kt
@@ -1,6 +1,5 @@
 package net.torvald.terrarum.console
 
-import com.sun.javaws.exceptions.InvalidArgumentException
 import net.torvald.imagefont.GameFontBase
 import net.torvald.terrarum.Terrarum
 
diff --git a/src/net/torvald/terrarum/mapgenerator/FloatingIslandsPreset.kt b/src/net/torvald/terrarum/mapgenerator/FloatingIslandsPreset.kt
index 1581f14bf..a62e052b8 100644
--- a/src/net/torvald/terrarum/mapgenerator/FloatingIslandsPreset.kt
+++ b/src/net/torvald/terrarum/mapgenerator/FloatingIslandsPreset.kt
@@ -1,7 +1,6 @@
 package net.torvald.terrarum.mapgenerator
 
 import net.torvald.random.HQRNG
-import com.sun.javaws.exceptions.InvalidArgumentException
 
 import java.util.Random