diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 1896bbbe0a21a..57d495f6f9361 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1010,7 +1010,7 @@ public class SettingsProvider extends ContentProvider {
                 break;
 
             default:
-                if (setting.startsWith(Settings.Global.DATA_ROAMING)) {
+                if (setting != null && setting.startsWith(Settings.Global.DATA_ROAMING)) {
                     if ("0".equals(value)) return false;
                     restriction = UserManager.DISALLOW_DATA_ROAMING;
                     break;