diff --git a/app/src/test/java/uk.org.openseizuredetector/SdServiceConnection.java b/app/src/androidTest/java/uk.org.openseizuredetector/SdServiceConnection.java
similarity index 100%
rename from app/src/test/java/uk.org.openseizuredetector/SdServiceConnection.java
rename to app/src/androidTest/java/uk.org.openseizuredetector/SdServiceConnection.java
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 8a3febd..a7599bb 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -235,7 +235,12 @@ public class SdServer extends Service implements SdDataReceiver {
             Log.d(TAG, "mmm...mWakeLock is null, so not releasing lock.  This shouldn't happen!");
         }
 
-        mSdDataSource.stop();
+        if (mSdDataSource!=null) {
+            Log.v(TAG,"stopping mSdDataSource");
+            mSdDataSource.stop();
+        } else {
+            Log.e(TAG,"ERROR - mSdDataSource is null - why????");
+        }
 
         // Stop the data update timer
         if (mCancelAudibleTimer !=null) {
diff --git a/app/src/main/res/xml/alarm_prefs.xml b/app/src/main/res/xml/alarm_prefs.xml
index 69c746e..b041f43 100644
--- a/app/src/main/res/xml/alarm_prefs.xml
+++ b/app/src/main/res/xml/alarm_prefs.xml
@@ -23,6 +23,13 @@
             android:key="AudibleFaultWarning"
             android:summary="Issue an audible alarm if the system detects a fault (e.g. can not talk to Pebble)."
             android:title="Enable Audible System FaultWarnings" />
+        <EditTextPreference
+            android:key="FaultTimerPeriod"
+            android:title="Fault Timer Duration (sec)"
+            android:summary="Duration that fault alarms are muted before initiating."
+            android:numeric="integer"
+            android:defaultValue="30" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="SMS Alarm Settings">
diff --git a/app/src/main/res/xml/general_prefs.xml b/app/src/main/res/xml/general_prefs.xml
index b2b349f..3c6c068 100644
--- a/app/src/main/res/xml/general_prefs.xml
+++ b/app/src/main/res/xml/general_prefs.xml
@@ -17,12 +17,6 @@
         android:key="LogData"
         android:summary="Log Data to SD Card Regularly"
         android:title="Log Data to SD Card" />
-    <EditTextPreference
-        android:key="FaultTimerPeriod"
-        android:title="Fault Timer Duration (sec)"
-        android:summary="Duration that fault alarms are muted before initiating."
-        android:numeric="integer"
-        android:defaultValue="30" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="PreventSleep"