diff --git a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt
index d86c8e4..4ab157d 100644
--- a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt
+++ b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/EmbeddedDistributorReceiver.kt
@@ -20,7 +20,7 @@ open class EmbeddedDistributorReceiver : BroadcastReceiver() {
     open val googleProjectNumber = "0000"
 
     override fun onReceive(context: Context, intent: Intent) {
-        val token = intent.getStringExtra(EXTRA_TOKEN)!!
+        val token = intent.getStringExtra(EXTRA_TOKEN) ?: return
         Log.d(TAG, "New intent for $token")
         when (intent.action) {
             ACTION_REGISTER -> {
diff --git a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt
index 35ef9c4..f7b4a9c 100644
--- a/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt
+++ b/lib/src/main/java/org/unifiedpush/android/foss_embedded_fcm_distributor/fcm/FirebaseReceiver.kt
@@ -85,15 +85,16 @@ class FirebaseReceiver : BroadcastReceiver() {
                 data.getString("s")?.let { splitId ->
                     if (pendingMessages.containsKey(mId)) {
                         Log.d(TAG, "Found pending message")
-                        when (splitId) {
+                        message = when (splitId) {
                             "1" -> {
-                                message = Base64.decode(b64, Base64.DEFAULT) +
-                                        pendingMessages[mId]!!
+                                Base64.decode(b64, Base64.DEFAULT) +
+                                        (pendingMessages[mId] ?: ByteArray(0))
                             }
                             "2" -> {
-                                message = pendingMessages[mId]!! +
+                                (pendingMessages[mId] ?: ByteArray(0)) +
                                         Base64.decode(b64, Base64.DEFAULT)
                             }
+                            else -> ByteArray(0)
                         }
                         pendingMessages.remove(mId)
                     } else {