diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java
index cb1eb03a7..2a56c2ff0 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java
@@ -35,6 +35,10 @@ public abstract class AuthenticationProviderProperty implements GuacamolePropert
     @Override
     public AuthenticationProvider parseValue(String authProviderClassName) throws GuacamoleException {
 
+        // If no property provided, return null.
+        if (authProviderClassName == null)
+            return null;
+
         // Get auth provider instance
         try {