From e759f1c948ab3ec4cd8b2e1b2a515b799449e924 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Mon, 29 Aug 2016 14:47:38 +0200
Subject: [PATCH] [android] #6113 - receiver not registered exception (#6130)

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 3cb28ed39..7640c9fb3 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -556,8 +556,10 @@ public class MapView extends FrameLayout {
     @UiThread
     public void onPause() {
         // Register for connectivity changes
-        getContext().unregisterReceiver(mConnectivityReceiver);
-        mConnectivityReceiver = null;
+        if (mConnectivityReceiver != null) {
+            getContext().unregisterReceiver(mConnectivityReceiver);
+            mConnectivityReceiver = null;
+        }
 
         mMyLocationView.onPause();
     }