diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67a754818..da45a0c02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 0.15.2
+* Mi Band: Fix crash with unknown notification sources
+
 ####Version 0.15.1
 * Improved handling of notifications for some apps
 * Pebble 2/LE: Add setting to limit GATT MTU for debugging broken BLE stacks
diff --git a/app/build.gradle b/app/build.gradle
index 92a026ec4..a4caf211b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.15.1"
-        versionCode 78
+        versionName "0.15.2"
+        versionCode 79
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index c3cd2b3c7..b033c7411 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -34,6 +34,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.AppNotificationType;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceCommunicationService;
 import nodomain.freeyourgadget.gadgetbridge.util.LimitedQueue;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@@ -251,6 +252,10 @@ public class NotificationListener extends NotificationListenerService {
 
         notificationSpec.type = AppNotificationType.getInstance().get(source);
 
+        if (notificationSpec.type == null) {
+            notificationSpec.type = NotificationType.UNKNOWN;
+        }
+
         LOG.info("Processing notification from source " + source + " with flags: " + notification.flags);
 
         dissectNotificationTo(notification, notificationSpec, preferBigText);
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0f46a0a76..846d85b28 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -22,8 +22,11 @@
   <string name="appmananger_app_delete">Löschen</string>
   <string name="appmananger_app_delete_cache">Löschen und aus dem Zwischenspeicher entfernen</string>
   <string name="appmananger_app_reinstall">Erneut installieren</string>
+  <string name="appmanager_app_openinstore">Im Pebble Appstore suchen</string>
   <string name="appmanager_health_activate">aktivieren</string>
   <string name="appmanager_health_deactivate">deaktivieren</string>
+  <string name="appmanager_hrm_activate">HRM aktivieren</string>
+  <string name="appmanager_hrm_deactivate">HRM deaktivieren</string>
   <string name="app_configure">Konfigurieren</string>
   <string name="app_move_to_top">Nach oben</string>
   <!--Strings related to AppBlacklist-->
@@ -85,12 +88,20 @@
   <string name="pref_title_location_aquire">Standort Bestimmen</string>
   <string name="pref_title_location_latitude">Breitengrad</string>
   <string name="pref_title_location_longitude">Längengrad</string>
+  <string name="pref_title_location_keep_uptodate">Automatisch Standort aktualisieren</string>
+  <string name="pref_summary_location_keep_uptodate">Versuche den aktuellen Standort zur Laufzeit abzufragen und nutze die gespeicherten Standort falls das fehlschlägt</string>
   <string name="toast_enable_networklocationprovider">Bitte ungefähre Standortbestimmung einschalten</string>
   <string name="toast_aqurired_networklocation">Standort wurde bestimmt</string>
   <string name="pref_title_pebble_forceprotocol">Benachrichtigungsprotokoll erzwingen</string>
   <string name="pref_summary_pebble_forceprotocol">Diese Option erzwingt das neuste Benachrichtigungsprotokoll abhängig von der Firmwareversion. NUR EINSCHALTEN, WENN DU WEISST WAS DU TUST!</string>
   <string name="pref_title_pebble_forceuntested">Ungetestete Features freischalten</string>
   <string name="pref_summary_pebble_forceuntested">Schaltet ungetetestete Features frei. TU DIES NUR, WENN DU WEIßT, WAS DU TUST!</string>
+  <string name="pref_title_pebble_forcele">BLE immer bevorzugen</string>
+  <string name="pref_summary_pebble_forcele">Nutze den experimentellen LE support für alle Pebbles anstelle von BT classic. Setzt voraus, dass die \"Pebble LE\" gepaart wird, nachdem die nicht-LE Pebble einmal verbunden war.</string>
+  <string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU Limit</string>
+  <string name="pref_summary_pebble_mtu_limit">Wenn deine Pebble 2/Pebble LE nicht so wie erwartet funktioniert, versuche die MTU zu begrenzen (erlaubte Werte zwischen 20–512)</string>
+  <string name="pref_title_pebble_enable_applogs">Watch App Logging einschalten</string>
+  <string name="pref_summary_pebble_enable_applogs">Schreibt logs von Watch Apps in Gadgetbridge logs (Pebble muss nach Ändern der Option erneut verbunden werden)</string>
   <string name="pref_title_pebble_reconnect_attempts">Neuverbindungsversuche</string>
   <string name="not_connected">nicht verbunden</string>
   <string name="connecting">verbinde</string>
@@ -126,7 +137,7 @@
   <string name="title_activity_android_pairing">Gerät paaren</string>
   <string name="android_pairing_hint">Verwende den Android Bluetooth Paaren-Dialog um Dein Gerät zu paaren.</string>
   <string name="title_activity_mi_band_pairing">Paare Dein Mi Band</string>
-  <string name="pairing">Paarung mit %s…</string>
+  <string name="pairing">Pairing mit %s…</string>
   <string name="message_cannot_pair_no_mac">Kein MAC Adresse bekommen, kann nicht paaren.</string>
   <string name="preferences_category_device_specific_settings">Gerätespezifische Einstellungen</string>
   <string name="preferences_miband_settings">Mi Band Einstellungen</string>
@@ -297,4 +308,5 @@ Wenn Du schon deine Daten importiert hast und mit dem Ergebnis zufrieden bist, k
   <string name="Delete">Löschen</string>
   <!--Strings related to Vibration Activity-->
   <string name="title_activity_vibration">Vibration</string>
+  <!--Strings related to Pebble Pairing Activity-->
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3214d1713..b0a40f605 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -98,6 +98,8 @@
   <string name="pref_summary_pebble_forceuntested">Habilita características que no han sido probadas. ¡HABILÍTALO SOLO SI SABES LO QUE ESTÁS HACIENDO!</string>
   <string name="pref_title_pebble_forcele">Preferir siempre BLE</string>
   <string name="pref_summary_pebble_forcele">Usar el soporte experimental de Pebble LE para todos los Pebble en lugar del bluetooth clásico. Requiere vincular \"Pebble LE\" si un Pebble no-LE ha sido vinculado antes.</string>
+  <string name="pref_title_pebble_mtu_limit">Pebble 2/LE límite de GATT MTU</string>
+  <string name="pref_summary_pebble_mtu_limit">Si su Pebble 2/Pebble LE no funciona correctamente, pruebe esta opción para limitar el MTU (rango válido 20–512)</string>
   <string name="pref_title_pebble_enable_applogs">Activar crear registros de la App del Reloj</string>
   <string name="pref_summary_pebble_enable_applogs">Producirá registros de las apps del reloj que Gadgetbridge guardará (necesita reconexión)</string>
   <string name="pref_title_pebble_reconnect_attempts">Intentos de reconexión</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 21200fee6..ddddedfa8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -98,6 +98,8 @@
   <string name="pref_summary_pebble_forceuntested">テストされていない機能を有効にします。何をしているかわかっている場合のみ有効にしてください!</string>
   <string name="pref_title_pebble_forcele">常に BLE を好みにする</string>
   <string name="pref_summary_pebble_forcele">すべてのPebbleに対して、BT クラシックではなく実験的なPebble LEサポートを使用します。非LEで一度接続された後に \"Pebble LE\" をペアリングする必要があります</string>
+  <string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU 制限</string>
+  <string name="pref_summary_pebble_mtu_limit">Pebble 2/Pebble LE が期待どおりに機能しない場合は、この設定を試して MTU を制限してください (有効範囲 20-512)</string>
   <string name="pref_title_pebble_enable_applogs">ウォッチアプリのログ記録を有効にする</string>
   <string name="pref_summary_pebble_enable_applogs">Gadgetbridgeがウォッチアプリからログを記録するようにする (再接続が必要です)</string>
   <string name="pref_title_pebble_reconnect_attempts">再接続の試行</string>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 7af992082..1c3b676ff 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.15.2" versioncode="79">
+        <change>Mi Band: Fix crash with unknown notification sources</change>
+    </release>
     <release version="0.15.1" versioncode="78">
         <change>Improved handling of notifications for some apps</change>
         <change>Pebble 2/LE: Add setting to limit GATT MTU for debugging broken BLE stacks</change>