diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
index dac821d..229bcfe 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
@@ -60,6 +60,10 @@
             screen.removeAll();
         }
 
+        if (devices == null) {
+            return;
+        }
+
         // Add entries for the discovered Bluetooth devices
         for (BluetoothDevice bt : devices) {
             final Preference preference = new Preference(themedContext);