1 files changed, 9 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index 4120e164a4..9d7d980ae3 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -235,8 +235,10 @@ final class MapGestureDetector {
         velocityTracker = null;
         break;
       case MotionEvent.ACTION_MOVE:
-        velocityTracker.addMovement(event);
-        velocityTracker.computeCurrentVelocity(1000);
+        if (velocityTracker != null) {
+          velocityTracker.addMovement(event);
+          velocityTracker.computeCurrentVelocity(1000);
+        }
         break;
     }
 
@@ -551,6 +553,11 @@ final class MapGestureDetector {
     // Called when fingers leave screen
     @Override
     public void onScaleEnd(final ScaleGestureDetector detector) {
+      if (velocityTracker == null) {
+        return;
+      }
+
+
       if (rotateGestureOccurred || quickZoom) {
         reset();
         return;