diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java
index 5cf33e98..0004fee8 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java
@@ -497,7 +497,7 @@ public class DefaultConnection implements Connection {
      */
     private static URL toURL(URI uri) {
         try {
-            return uri.toURL();
+            return uri != null ? uri.toURL() : null;
         } catch (MalformedURLException ex) {
             throw new AcmeProtocolException("Invalid URL: " + uri, ex);
         }