From f861546e12b50c6de93a88ce5634a472e479912f Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Sat, 12 Aug 2017 11:20:56 +0200
Subject: [PATCH] Quickfix to avoid crashes after staleData merge

---
 .../plugins/NSClientInternal/data/NSSettingsStatus.java         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java
index 189474c9c8..4829af714e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java
@@ -201,6 +201,7 @@ public class NSSettingsStatus {
 
     private String getStringOrNull(String key) {
         String ret = null;
+        if(data == null) return null;
         if (data.has(key)) {
             try {
                 ret = data.getString(key);
@@ -309,6 +310,7 @@ public class NSSettingsStatus {
     public JSONObject extentendedPumpSettings() {
         try {
             JSONObject extended = getExtendedSettings();
+            if(extended == null) return null;
             if (extended.has("pump")) {
                 JSONObject pump = extended.getJSONObject("pump");
                 return pump;