diff --git a/README.md b/README.md
index ef67e328c..14a9fef2b 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,12 @@ Features:
 
 * Incoming calls notification and display (caller, phone number)
 * Outgoing call display
-* Reject/Hangup Calls
+* Reject/hangup calls
 * SMS notification (sender, body)
 * K-9 Mail notification support (sender, subject, preview)
 * Support for generic notificaions (above filtered out)
-* Apollo Music Playback info (artist, album, track)
-* Music Control: Play/Pause, Next Track, Previous Track
+* Apollo playback info (artist, album, track)
+* Music control: play/pause, next track, previous track
 
 How to use:
 
diff --git a/app/build.gradle b/app/build.gradle
index 2b4b58700..07d2e78ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,15 @@ android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
 
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+
     defaultConfig {
         applicationId "nodomain.freeyourgadget.gadgetbridge"
         minSdkVersion 19
         targetSdkVersion 21
         versionCode 1
-        versionName "1.0"
+        versionName "0.1.0"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
index 89fcfd11e..27387d138 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
@@ -170,8 +170,10 @@ public class BluetoothCommunicationService extends Service {
                         btDeviceAddress = device.getAddress();
                     }
                 }
-
-                if (mBtSocket == null || !mBtSocket.isConnected()) {
+                if (btDeviceAddress == null) {
+                    Toast.makeText(this, "No supported device paired", Toast.LENGTH_SHORT).show();
+                }
+                else if (mBtSocket == null || !mBtSocket.isConnected()) {
                     // currently only one thread allowed
                     if (mBtSocketIoThread != null) {
                         mBtSocketIoThread.quit();
diff --git a/build.gradle b/build.gradle
index 6356aabdc..2765df799 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,3 +17,8 @@ allprojects {
         jcenter()
     }
 }
+
+ext {
+    compileSdkVersion = 21
+    buildToolsVersion = "21.1.2"
+}
\ No newline at end of file