diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java
index fecae7f72..36754306e 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java
@@ -72,6 +72,11 @@ public class DocumentHandler extends DefaultHandler {
      * @return The current element state.
      */
     private DocumentHandlerState getCurrentState() {
+
+        // If no state, return null
+        if (stack.isEmpty())
+            return null;
+
         return stack.getLast();
     }