diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java
index 15328436d..193a2d55c 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/permissions/List.java
@@ -116,12 +116,12 @@ public class List extends AuthenticatingHttpServlet {
 
                 // Get specific user
                 user = users.get(username);
-                if (user == null)
-                    throw new GuacamoleSecurityException("No such user.");
-
             }
             else
                 user = context.self();
+            
+            if (user == null)
+                throw new GuacamoleSecurityException("No such user.");
 
             // Write XML content type
             response.setHeader("Content-Type", "text/xml");