From 2da60d28fd1d3a374a94e438877e1b87aa0952fb Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Tue, 7 Jan 2020 13:35:50 +0100
Subject: [PATCH] Use hasInstance on public static getters of Mapbox.java
 (#128)

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

diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
index 35f7a5975..bcc793b04 100644
--- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
+++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -115,7 +115,7 @@ public final class Mapbox {
    * @return the SKU token
    */
   public static String getSkuToken() {
-    if (INSTANCE.accounts == null) {
+    if (!hasInstance() || INSTANCE.accounts == null) {
       throw new MapboxConfigurationException(
         "A valid access token parameter is required when using a Mapbox service."
           + "\nPlease see https://www.mapbox.com/help/create-api-access-token/ to learn how to create one."
@@ -179,7 +179,7 @@ public final class Mapbox {
    */
   @Nullable
   public static TelemetryDefinition getTelemetry() {
-    return INSTANCE.telemetry;
+    return hasInstance() ? INSTANCE.telemetry : null;
   }
 
   /**