diff --git a/sdk/src/java/cyanogenmod/hardware/LiveDisplayManager.java b/sdk/src/java/cyanogenmod/hardware/LiveDisplayManager.java
index 0e4f7a1..e75c9d8 100644
--- a/sdk/src/java/cyanogenmod/hardware/LiveDisplayManager.java
+++ b/sdk/src/java/cyanogenmod/hardware/LiveDisplayManager.java
@@ -127,8 +127,8 @@
         }
         sService = getService();
 
-        if (context.getPackageManager().hasSystemFeature(
-                CMContextConstants.Features.LIVEDISPLAY) && !checkService()) {
+        if (!context.getPackageManager().hasSystemFeature(
+                CMContextConstants.Features.LIVEDISPLAY) || !checkService()) {
             throw new RuntimeException("Unable to get LiveDisplayService. The service either" +
                     " crashed, was not started, or the interface has been called to early in" +
                     " SystemServer init");
@@ -136,6 +136,9 @@
 
         try {
             mConfig = sService.getConfig();
+            if (mConfig == null) {
+                throw new RuntimeException("Unable to get LiveDisplay configuration!");
+            }
         } catch (RemoteException e) {
             throw new RuntimeException("Unable to fetch LiveDisplay configuration!", e);
         }