diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
index d40f91e36..7f53bf834 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
@@ -32,6 +32,10 @@ public abstract class URIGuacamoleProperty implements GuacamoleProperty<URI> {
     @Override
     public URI parseValue(String value) throws GuacamoleException {
         
+        // If nothing is provided, just return null.
+        if (value == null)
+            return null;
+        
         try {
             return new URI(value);
         }