diff --git a/app/release/app-release-3.6.1j.apk b/app/release/app-release-3.6.1j.apk
new file mode 100644
index 0000000..b925834
Binary files /dev/null and b/app/release/app-release-3.6.1j.apk differ
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 7afacc0..b925834 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 1fd386b..476d01b 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 81,
-      "versionName": "3.6.1h",
+      "versionCode": 82,
+      "versionName": "3.6.1j",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c046fa3..47ecbd2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
-    android:versionCode="81"
-    android:versionName="3.6.1h">
+    android:versionCode="82"
+    android:versionName="3.6.1j">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/LocationFinder.java b/app/src/main/java/uk/org/openseizuredetector/LocationFinder.java
index 5e09140..ce453a5 100644
--- a/app/src/main/java/uk/org/openseizuredetector/LocationFinder.java
+++ b/app/src/main/java/uk/org/openseizuredetector/LocationFinder.java
@@ -1,5 +1,6 @@
 package uk.org.openseizuredetector;
 
+
 /**
  */
 
@@ -43,8 +44,9 @@ public class LocationFinder implements LocationListener
 
     public void destroy() {
         // Cancel location updates
-        mLocationManager.removeUpdates(this);
-
+        if (mLocationManager != null) {
+            mLocationManager.removeUpdates(this);
+        }
         // cancel the timeout timer
         if (mTimeoutTimer != null) {
             mTimeoutTimer.cancel();
diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index 7853363..4628262 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -594,7 +594,7 @@ public class MainActivity extends AppCompatActivity {
                         tv.setTextColor(warnTextColour);
 
                         tv = (TextView) findViewById(R.id.appTv);
-                        tv.setText(R.string.WatchApp+" ----");
+                        tv.setText(getString(R.string.WatchApp)+" ----");
                         tv.setBackgroundColor(warnColour);
                         tv.setTextColor(warnTextColour);
 
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 267aa16..864c25a 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -388,6 +388,7 @@ public class SdServer extends Service implements SdDataReceiver {
         // Stop the location finder.
         if (mLocationFinder != null) {
             mLocationFinder.destroy();
+            mLocationFinder = null;
         }
 
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9ac9bb3..a7b3c53 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -109,7 +109,7 @@
   <string name="no_wifi_connection">Network State Changed - no Wifi Connection</string>
   <string name="no_active_network">Network State Changed - No Active Network</string>
   <string name="problem_parsing_preferences">Problem Parsing Preferences - Something won\'t work - Please go back to Settings and correct it!</string>
-  <string name="send_sms_last_location">\"Send SMS - last location is \"</string>
+  <string name="send_sms_last_location">"Send SMS - last location is "</string>
   <string name="failed_to_send_sms">ERROR: FAILED TO SEND SMS MESSAGE</string>
   <string name="sms_alarms_disabled">SMS Alarms Disabled - not doing anything!</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3405945..01e2db9 100644
Binary files a/app/src/main/res/values-ru/strings.xml and b/app/src/main/res/values-ru/strings.xml differ
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d20a33f..0a70a82 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -42,7 +42,7 @@
     <string name="Mute">Stäng av</string>
     <string name="Alarm">**LARM**</string>
     <string name="Fall">**FALL**</string>
-    <string name="HR_Equals">\"Puls = \"</string>
+    <string name="HR_Equals">"Puls = "</string>
     <string name="HRAlarmOff">Pulslarm Av</string>
     <string name="WatchAppOK">Smartklocka app OK</string>
     <string name="WatchAppNotRunning">Smartklocka app AV</string>
@@ -123,7 +123,7 @@
     <string name="no_wifi_connection">Nätverksstatus ändrad - ingen uppkoppling</string>
     <string name="no_active_network">Nätverksstatus ändrad - inga aktiva nätverk</string>
     <string name="problem_parsing_preferences">Något gick fel! Problem med inställningarna - justera dessa.</string>
-    <string name="send_sms_last_location">\"Sänd SMS - senast kända plats är \"</string>
+    <string name="send_sms_last_location">"Sänd SMS - senast kända plats är "</string>
     <string name="failed_to_send_sms">ERROR: SMS ej sänt</string>
     <string name="sms_alarms_disabled">SMS-larm avstängt- ingen åtgärd!</string>