diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
index cb99fcb4..7dc55e64 100644
--- a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
+++ b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
@@ -1206,7 +1206,7 @@ public class GLFW
         return false;
     }
     public static String glfwGetGamepadName(int jid) {
-        return null;
+        return "Unknown";
     }
     public static boolean glfwGetGamepadState(int jid, GLFWGamepadState state) {
         return false;