1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java
index bc858fdcb..4bf73a41b 100644
--- a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java
+++ b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java
@@ -99,6 +99,10 @@ public class NumberPickerPreference extends DialogPreference {
 
         mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
 
+        if (mNumberPicker == null) {
+            throw new RuntimeException("NumberPicker is null!");
+        }
+
         // Initialize state
         mNumberPicker.setMaxValue(max);
         mNumberPicker.setMinValue(min);
@@ -107,9 +111,11 @@ public class NumberPickerPreference extends DialogPreference {
 
         // No keyboard popup
         EditText textInput = (EditText) mNumberPicker.findViewById(com.android.internal.R.id.numberpicker_input);
-        textInput.setCursorVisible(false);
-        textInput.setFocusable(false);
-        textInput.setFocusableInTouchMode(false);
+        if (textInput != null) {
+            textInput.setCursorVisible(false);
+            textInput.setFocusable(false);
+            textInput.setFocusableInTouchMode(false);
+        }
 
         return view;
     }