diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java
index bb2eac473..dc35e3b6c 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java
@@ -99,10 +99,11 @@ public abstract class DecoratingDirectory<ObjectType extends Identifiable>
 
         // Decorate only if object exists
         ObjectType object = super.get(identifier);
-        if (object == null)
-            return object;
+        if (object != null)
+            return decorate(object);
+
+        return null;
 
-        return decorate(object);
     }
 
     @Override