diff --git a/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java b/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
index cbbc3ff..d6ce448 100644
--- a/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
+++ b/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
@@ -511,14 +511,17 @@
                 TIMEOUT * 3).click();
         Thread.sleep(TIMEOUT * 3);
         flashLight = mDevice.wait(
-                Until.findObject(By.descContains(FLASHLIGHT)),
+                Until.findObject(By.desc(FLASHLIGHT)),
                 TIMEOUT * 3);
-        if (verifyOn) {
-            Assert.assertTrue(flashLight.getText().equals(lightOff));
-        } else {
-            Assert.assertTrue(flashLight.getText().equals(lightOn));
-            mDevice.wait(Until.findObject(By.textContains(FLASHLIGHT)),
-                    TIMEOUT * 3).click();
+        if (flashLight != null) {
+            String txt = flashLight.getText();
+            if (verifyOn) {
+                Assert.assertTrue(txt.equals(lightOff));
+            } else {
+                Assert.assertTrue(txt.equals(lightOn));
+                mDevice.wait(Until.findObject(By.textContains(FLASHLIGHT)),
+                        TIMEOUT * 3).click();
+            }
         }
         mDevice.pressHome();
         Thread.sleep(TIMEOUT * 3);