diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java index a14371276..ad38ae334 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java @@ -104,7 +104,8 @@ public class FcmSender implements PushNotificationSender { if (firebaseMessagingException.getMessagingErrorCode() != null) { errorCode = firebaseMessagingException.getMessagingErrorCode().name(); - if (firebaseMessagingException.getMessagingErrorCode() == MessagingErrorCode.QUOTA_EXCEEDED) { + if (firebaseMessagingException.getMessagingErrorCode() == MessagingErrorCode.QUOTA_EXCEEDED + && firebaseMessagingException.getHttpResponse() != null) { logger.info("FCM request failed with quota exceeded; retry-after: {}, response body: {}", firebaseMessagingException.getHttpResponse().getHeaders().get("retry-after"), firebaseMessagingException.getHttpResponse().getContent());