diff --git a/src/com/github/kaeppler/whichscreen/DeviceInfo.java b/src/com/github/kaeppler/whichscreen/DeviceInfo.java
index a7c66ad..6fae06c 100644
--- a/src/com/github/kaeppler/whichscreen/DeviceInfo.java
+++ b/src/com/github/kaeppler/whichscreen/DeviceInfo.java
@@ -89,23 +89,25 @@ public String getDensityClass() {
 
     public String getUiMode() {
         String uiModeString = null;
-        int uiMode = configuration.uiMode & Configuration.UI_MODE_TYPE_MASK;
-        switch (uiMode) {
-            case UI_MODE_TYPE_NORMAL:
-                uiModeString = "NORMAL";
-                break;
-            case UI_MODE_TYPE_DESK:
-                uiModeString = "DESK";
-                break;
-            case UI_MODE_TYPE_CAR:
-                uiModeString = "CAR";
-                break;
-            case UI_MODE_TYPE_TELEVISION:
-                uiModeString = "TV";
-                break;
-            default:
-                uiModeString = "?";
-        }
+	if (Build.VERSION.SDK_INT >= 8) {
+	    int uiMode = configuration.uiMode & Configuration.UI_MODE_TYPE_MASK;
+	    switch (uiMode) {
+                case UI_MODE_TYPE_NORMAL:
+                    uiModeString = "NORMAL";
+                    break;
+                case UI_MODE_TYPE_DESK:
+                    uiModeString = "DESK";
+                    break;
+                case UI_MODE_TYPE_CAR:
+                    uiModeString = "CAR";
+                    break;
+                case UI_MODE_TYPE_TELEVISION:
+                    uiModeString = "TV";
+                    break;
+                default:
+                    uiModeString = "?";
+	    }
+	}
         return uiModeString;
     }
 
diff --git a/src/com/github/kaeppler/whichscreen/ScreenDetectorActivity.java b/src/com/github/kaeppler/whichscreen/ScreenDetectorActivity.java
index 3e30cf6..a299712 100644
--- a/src/com/github/kaeppler/whichscreen/ScreenDetectorActivity.java
+++ b/src/com/github/kaeppler/whichscreen/ScreenDetectorActivity.java
@@ -32,7 +32,10 @@ public void onCreate(Bundle savedInstanceState) {
         StringBuilder sb = new StringBuilder();
         sb.append("Scaled Density: " + deviceInfo.getScaledDensity());
         sb.append("\nReal Density: " + deviceInfo.getScreenDensity());
-        sb.append("\nUI mode: " + deviceInfo.getUiMode());
+	String uiMode = deviceInfo.getUiMode();
+	if (uiMode != null) {
+	    sb.append("\nUI mode: ").append(uiMode);
+	}
         text2.setText(sb.toString());
 
         TextView textX = (TextView) findViewById(R.id.text_x);
diff --git a/src/com/github/kaeppler/whichscreen/service/UploadService.java b/src/com/github/kaeppler/whichscreen/service/UploadService.java
index 5813d09..350213e 100644
--- a/src/com/github/kaeppler/whichscreen/service/UploadService.java
+++ b/src/com/github/kaeppler/whichscreen/service/UploadService.java
@@ -50,6 +50,9 @@ protected void onHandleIntent(Intent intent) {
                 return;
 
             try {
+		String uiMode = deviceInfo.getUiMode();
+		if (uiMode == null)
+		    uiMode = "null";
                 url = new URL(
                         String.format("https://docs.google.com/spreadsheet/formResponse?formkey=dEExRVg5aDQ4NHhUTmZicFdvT2c2b2c6MQ&ifq?entry.0.single=%s&entry.1.single=%s&entry.2.single=%s&entry.3.single=%s&entry.4.single=%s&entry.5.single=%s&entry.6.single=%s&entry.7.single=%s&entry.8.single=%s&entry.9.single=%s&entry.10.single=%s&entry.11.single=%s&entry.12.single=%s",
                                 URLEncoder.encode(deviceInfo.getHashOfAndroidId()),
@@ -59,7 +62,7 @@ protected void onHandleIntent(Intent intent) {
                                 URLEncoder.encode(deviceInfo.getScreenDensity()),
                                 URLEncoder.encode(deviceInfo.getSizeClass()),
                                 URLEncoder.encode(deviceInfo.getDensityClass()),
-                                URLEncoder.encode(deviceInfo.getUiMode()),
+                                URLEncoder.encode(uiMode),
                                 URLEncoder.encode(deviceInfo.getScreenX()),
                                 URLEncoder.encode(deviceInfo.getScreenY()),
                                 URLEncoder.encode(deviceInfo.getHashOfAndroidId()),