diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/IntegerGuacamoleProperty.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/IntegerGuacamoleProperty.java
index 44bff8ecb..c57003e2d 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/IntegerGuacamoleProperty.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/IntegerGuacamoleProperty.java
@@ -49,6 +49,10 @@ public abstract class IntegerGuacamoleProperty implements GuacamoleProperty<Inte
     @Override
     public Integer parseValue(String value) throws GuacamoleException {
 
+        // If no property provided, return null.
+        if (value == null)
+            return null;
+
         try {
             Integer integer = new Integer(value);
             return integer;