diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b51a6d1f..c4434cbc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,10 +14,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="18" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="18" />
 
     <application
         android:name=".MapzenApplication"
diff --git a/src/main/java/com/mapzen/open/core/StyleDownLoader.java b/src/main/java/com/mapzen/open/core/StyleDownLoader.java
index 69391f0e..2414dcb6 100644
--- a/src/main/java/com/mapzen/open/core/StyleDownLoader.java
+++ b/src/main/java/com/mapzen/open/core/StyleDownLoader.java
@@ -47,6 +47,10 @@ public void download() {
         (new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
+                if (client == null) {
+                    return null;
+                }
+
                 URL url = null;
                 try {
                     url = new URL(host + "manifest");