diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0da3868..9bcb73f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
 
+    V2.0.8 - 24 Aug 2016
+    - Added checks for correct version of pebble watch app for compatibility with this
+    Android App.
+
 	V2.0.7 - 18 Aug 2016
 	- Added AnalysisPeriod setting to Pebble Datasource to change
 	the period between data analyses (rather than the default 5 seconds
diff --git a/app/app-release-2.0.8.apk b/app/app-release-2.0.8.apk
new file mode 100644
index 0000000..52d60b0
Binary files /dev/null and b/app/app-release-2.0.8.apk differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95abbc7..c23fbde 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.org.openseizuredetector"
-    android:versionCode="28"
-    android:versionName="2.0.7">
+    android:versionCode="29"
+    android:versionName="2.0.8">
 
   <uses-sdk android:minSdkVersion="14" />
 
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
index 8cb3470..a0b8a09 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
@@ -412,17 +412,25 @@ public class SdDataSourcePebble extends SdDataSource {
                 if (data.getUnsignedIntegerAsLong(KEY_DATA_TYPE)
                         == DATA_TYPE_SETTINGS) {
                     Log.v(TAG, "DATA_TYPE = Settings");
-                    mSdData.analysisPeriod = data.getUnsignedIntegerAsLong(KEY_SAMPLE_PERIOD);
-                    mSdData.alarmFreqMin = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MIN);
-                    mSdData.alarmFreqMax = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MAX);
-                    mSdData.nMin = data.getUnsignedIntegerAsLong(KEY_NMIN);
-                    mSdData.nMax = data.getUnsignedIntegerAsLong(KEY_NMAX);
-                    mSdData.warnTime = data.getUnsignedIntegerAsLong(KEY_WARN_TIME);
-                    mSdData.alarmTime = data.getUnsignedIntegerAsLong(KEY_ALARM_TIME);
-                    mSdData.alarmThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_THRESH);
-                    mSdData.alarmRatioThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_RATIO_THRESH);
-                    mSdData.batteryPc = data.getUnsignedIntegerAsLong(KEY_BATTERY_PC);
-                    mSdData.haveSettings = true;
+                    try {
+                        mSdData.analysisPeriod = data.getUnsignedIntegerAsLong(KEY_SAMPLE_PERIOD);
+                        mSdData.alarmFreqMin = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MIN);
+                        mSdData.alarmFreqMax = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MAX);
+                        mSdData.nMin = data.getUnsignedIntegerAsLong(KEY_NMIN);
+                        mSdData.nMax = data.getUnsignedIntegerAsLong(KEY_NMAX);
+                        mSdData.warnTime = data.getUnsignedIntegerAsLong(KEY_WARN_TIME);
+                        mSdData.alarmTime = data.getUnsignedIntegerAsLong(KEY_ALARM_TIME);
+                        mSdData.alarmThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_THRESH);
+                        mSdData.alarmRatioThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_RATIO_THRESH);
+                        mSdData.batteryPc = data.getUnsignedIntegerAsLong(KEY_BATTERY_PC);
+                        mSdData.haveSettings = true;
+                    } catch (Exception ex) {
+                        mUtil.showToast("*** Error interpreting settings sent from watch - Please check you have "
+                                + "the latest version of the watch app installed by using the OpenSeizureDetector "
+                                + "menu to install the Watch App");
+                        mUtil.writeToSysLogFile("Error interpreting settings received from watch - wrong version "
+                                + "of watch app installed?");
+                    }
                 }
                 if (data.getUnsignedIntegerAsLong(KEY_DATA_TYPE)
                         == DATA_TYPE_RAW) {