From 7a96eb1c25c880e16aa8b284dc51f9e0ce24c9f8 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Fri, 4 Mar 2016 17:11:37 +0100
Subject: [PATCH] Fix #66, for real this time

---
 .../main/java/org/microg/tools/selfcheck/NlpStatusChecks.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unifiednlp-base/src/main/java/org/microg/tools/selfcheck/NlpStatusChecks.java b/unifiednlp-base/src/main/java/org/microg/tools/selfcheck/NlpStatusChecks.java
index 13b233f..758c460 100644
--- a/unifiednlp-base/src/main/java/org/microg/tools/selfcheck/NlpStatusChecks.java
+++ b/unifiednlp-base/src/main/java/org/microg/tools/selfcheck/NlpStatusChecks.java
@@ -103,7 +103,8 @@ public void run() {
             @Override
             public void onLocationChanged(Location location) {
                 synchronized (result) {
-                    result.set(location != null && location.getExtras().containsKey(LOCATION_EXTRA_BACKEND_PROVIDER));
+                    result.set(location != null && location.getExtras() != null &&
+                            location.getExtras().containsKey(LOCATION_EXTRA_BACKEND_PROVIDER));
                     result.notifyAll();
                 }
             }