diff --git a/src/main/java/eu/siacs/conversations/services/UnifiedPushBroker.java b/src/main/java/eu/siacs/conversations/services/UnifiedPushBroker.java
index 2562e13a62a22d80edfc7e4bbe7d7a17a40ce5e3..c821aa1e7838a9e162c520a498229b609aa00be1 100644
--- a/src/main/java/eu/siacs/conversations/services/UnifiedPushBroker.java
+++ b/src/main/java/eu/siacs/conversations/services/UnifiedPushBroker.java
@@ -96,13 +96,13 @@ public class UnifiedPushBroker {
             if (transport.account.isEnabled()) {
                 renewUnifiedEndpoint(transportOptional.get(), pushTargetMessenger);
             } else {
-                if (pushTargetMessenger.messenger != null) {
+                if (pushTargetMessenger != null && pushTargetMessenger.messenger != null) {
                     sendRegistrationDelayed(pushTargetMessenger.messenger,"account is disabled");
                 }
                 Log.d(Config.LOGTAG, "skipping UnifiedPush endpoint renewal. Account is disabled");
             }
         } else {
-            if (pushTargetMessenger.messenger != null) {
+            if (pushTargetMessenger != null && pushTargetMessenger.messenger != null) {
                 sendRegistrationDelayed(pushTargetMessenger.messenger,"no transport selected");
             }
             Log.d(Config.LOGTAG, "skipping UnifiedPush endpoint renewal. No transport selected");