diff --git a/src/com/limelight/gui/GamepadConfigFrame.java b/src/com/limelight/gui/GamepadConfigFrame.java
index 3702037..40ddb7f 100644
--- a/src/com/limelight/gui/GamepadConfigFrame.java
+++ b/src/com/limelight/gui/GamepadConfigFrame.java
@@ -263,7 +263,11 @@ public class GamepadConfigFrame extends JFrame {
 	}
 	
 	private void setButtonText(JButton button, SourceComponent comp) {
-		button.setText(comp.getType().name() + " " + comp.getId());
+		if (comp == null) {
+			button.setText("");
+		} else {
+			button.setText(comp.getType().name() + " " + comp.getId());
+		}
 	}
 	
 	private class MappingThread extends Thread implements DeviceListener {