1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/app/src/main/java/com/wireguard/config/Peer.java
index 1eb30197..1250fcb3 100644
--- a/app/src/main/java/com/wireguard/config/Peer.java
+++ b/app/src/main/java/com/wireguard/config/Peer.java
@@ -35,14 +35,12 @@ public final class Peer {
     private final Key publicKey;
 
     private Peer(final Builder builder) {
-        if (builder.publicKey == null)
-            throw new IllegalArgumentException("Peers must have a public key");
         // Defensively copy to ensure immutability even if the Builder is reused.
         allowedIps = Collections.unmodifiableSet(new LinkedHashSet<>(builder.allowedIps));
         endpoint = builder.endpoint;
         persistentKeepalive = builder.persistentKeepalive;
         preSharedKey = builder.preSharedKey;
-        publicKey = builder.publicKey;
+        publicKey = Objects.requireNonNull(builder.publicKey, "Peers must have a public key");
     }
 
     /**
@@ -226,6 +224,8 @@ public final class Peer {
         }
 
         public Peer build() {
+            if (publicKey == null)
+                throw new IllegalArgumentException("Peers must have a public key");
             return new Peer(this);
         }