diff --git a/android/build.gradle b/android/build.gradle
index 8a174dc..0e649ac 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 16
diff --git a/android/src/main/java/com/devfd/RNGeocoder/RNGeocoderModule.java b/android/src/main/java/com/devfd/RNGeocoder/RNGeocoderModule.java
index 642ebfb..12e10b7 100644
--- a/android/src/main/java/com/devfd/RNGeocoder/RNGeocoderModule.java
+++ b/android/src/main/java/com/devfd/RNGeocoder/RNGeocoderModule.java
@@ -66,6 +66,10 @@ public void geocodePosition(ReadableMap position, Promise promise) {
     WritableArray transform(List<Address> addresses) {
         WritableArray results = new WritableNativeArray();
 
+        if (addresses == null) {
+            return results;
+        }
+
         for (Address address: addresses) {
             WritableMap result = new WritableNativeMap();