diff --git a/app/release/app-release-4.0.2.apk b/app/release/app-release-4.0.2.apk
new file mode 100644
index 0000000..d914c18
Binary files /dev/null and b/app/release/app-release-4.0.2.apk differ
diff --git a/app/release/app-release-4.0.1.apk b/app/release/old_versions/app-release-4.0.1.apk
similarity index 100%
rename from app/release/app-release-4.0.1.apk
rename to app/release/old_versions/app-release-4.0.1.apk
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 483ba54..a164208 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="98"
-    android:versionName="4.0.1">
+    android:versionCode="99"
+    android:versionName="4.0.2">
     <!-- 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/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index c71383e..e043a71 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -1289,14 +1289,19 @@ public class SdServer extends Service implements SdDataReceiver {
         public void onFinish() {
             Log.v(TAG, "SmsTimer.onFinish()");
             mTimeLeft = 0;
-            mLocationFinder.getLocation(this);
-            Location loc = mLocationFinder.getLastLocation();
-            if (loc != null) {
-                mUtil.showToast(getString(R.string.send_sms_last_location)
-                        + loc.getLongitude() + ","
-                        + loc.getLatitude());
+            if (mLocationFinder != null) {
+                mLocationFinder.getLocation(this);
+                Location loc = mLocationFinder.getLastLocation();
+                if (loc != null) {
+                    mUtil.showToast(getString(R.string.send_sms_last_location)
+                            + loc.getLongitude() + ","
+                            + loc.getLatitude());
+                } else {
+                    Log.i(TAG, "SmsTimer.onFinish() - Last Location is Null so sending first SMS without location.");
+                }
             } else {
-                Log.i(TAG, "SmsTimer.onFinish() - Last Location is Null so sending first SMS without location.");
+                Log.e(TAG,"SmsTImer.onFinish() - mLocationFinder is NULL - this should not happen!");
+                mUtil.showToast("Error Finding Location - mLocationFinder is null - please report this issue!");
             }
             Log.i(TAG, "SmsTimer.onFinish() - Sending to " + mSMSNumbers.length + " Numbers");
             mUtil.writeToSysLogFile("SdServer.SmsTimer.onFinish()");