diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
index 102978d6..99d4bd6d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
@@ -48,6 +48,12 @@ public class MusicPlaybackReceiver extends BroadcastReceiver {
         MusicStateSpec stateSpec = new MusicStateSpec(lastStateSpec);
 
         Bundle incomingBundle = intent.getExtras();
+
+        if (incomingBundle == null) {
+            LOG.warn("Not processing incoming null bundle.");
+            return;
+        }
+
         for (String key : incomingBundle.keySet()) {
             Object incoming = incomingBundle.get(key);
             if (incoming instanceof String && "artist".equals(key)) {