diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java b/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java
index 57bc6e25..74d9a619 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java
@@ -153,7 +153,10 @@ public abstract class AbstractAcmeClient implements AcmeClient {
                 conn.throwAcmeException();
             }
 
-            registration.setLocation(conn.getLocation());
+            URI location = conn.getLocation();
+            if (location != null) {
+                registration.setLocation(conn.getLocation());
+            }
 
             URI tos = conn.getLink("terms-of-service");
             if (tos != null) {