diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java
index 48b0b19..b5c0c3b 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java
@@ -42,6 +42,7 @@ public abstract class SplashOverlayMixin {
     private float progress;
 
     /**
+     * @author SaturnClient
      * @reason Replace vanilla splash rendering completely but keep exit logic
      */
     @Overwrite
diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java b/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java
index d65ebfd..f85d76e 100644
--- a/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java
+++ b/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java
@@ -21,9 +21,12 @@ public class KeybindingSelector extends Element {
     public void render(RenderScope renderScope, ElementContext ctx) {
         int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
         renderScope.drawRoundedRectangle(0, 0, width, height, 10, 0xFF000000);
-        renderScope.drawText(0.6f, prop.value == -1 ? "<NONE>" :
-            GLFW.glfwGetKeyName(prop.value, GLFW.glfwGetKeyScancode(prop.value)).toUpperCase(),
-            4, 4, Theme.FONT.value, textColor);
+        String name = GLFW.glfwGetKeyName(prop.value, GLFW.glfwGetKeyScancode(prop.value));
+
+        renderScope.drawText(0.6f,
+                prop.value == -1 ? "<NONE>"
+                        : name != null ? name.toUpperCase() : "<Invalid-Key>",
+                4, 4, Theme.FONT.value, textColor);
     }
 
     @Override