1 files changed, 12 insertions, 2 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
index 5b87e70ef6..accdbec40f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
@@ -3,10 +3,12 @@ package com.mapbox.mapboxsdk.http;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.mapbox.mapboxsdk.MapboxAccountManager;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.net.NoRouteToHostException;
 import java.net.ProtocolException;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -47,6 +49,11 @@ class HTTPRequest implements Callback {
         mNativePtr = nativePtr;
 
         try {
+            // Don't try a request if we aren't connected
+            if (!MapboxAccountManager.getInstance().isConnected()) {
+                throw new NoRouteToHostException("No Internet connection available.");
+            }
+
             HttpUrl httpUrl = HttpUrl.parse(resourceUrl);
             final String host = httpUrl.host().toLowerCase(MapboxConstants.MAPBOX_LOCALE);
             if (host.equals("mapbox.com") || host.endsWith(".mapbox.com")) {
@@ -73,7 +80,10 @@ class HTTPRequest implements Callback {
     }
 
     public void cancel() {
-        mCall.cancel();
+        // mCall can be null if the constructor gets aborted (e.g, under a NoRouteToHostException).
+        if (mCall != null) {
+            mCall.cancel();
+        }
 
         // TODO: We need a lock here because we can try
         // to cancel at the same time the request is getting
@@ -124,7 +134,7 @@ class HTTPRequest implements Callback {
         Log.w(LOG_TAG, String.format("[HTTP] Request could not be executed: %s", e.getMessage()));
 
         int type = PERMANENT_ERROR;
-        if ((e instanceof UnknownHostException) || (e instanceof SocketException) || (e instanceof ProtocolException) || (e instanceof SSLException)) {
+        if ((e instanceof NoRouteToHostException) || (e instanceof UnknownHostException) || (e instanceof SocketException) || (e instanceof ProtocolException) || (e instanceof SSLException)) {
             type = CONNECTION_ERROR;
         } else if ((e instanceof InterruptedIOException)) {
             type = TEMPORARY_ERROR;