diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationRequest.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationRequest.java index addeeddc6..0f48bf60c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationRequest.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationRequest.java @@ -89,6 +89,9 @@ public record RegistrationRequest(@Schema(requiredMode = Schema.RequiredMode.NOT @AssertTrue @Schema(hidden = true) boolean hasExactlyOneMessageDeliveryChannel() { + if (deviceActivationRequest == null || accountAttributes == null) { + return false; + } if (accountAttributes.getFetchesMessages()) { return deviceActivationRequest().apnToken().isEmpty() && deviceActivationRequest().gcmToken().isEmpty(); } else {