currentElement = new Pazpar2VersionResponse();\r
} else if (localName.equals("applicationerror")) {\r
currentElement = new CommandError();\r
- } else if (localName.equals("error") && dataElements.peek().getType().equals("applicationerror")) {\r
+ } else if (localName.equals("error") && (!dataElements.isEmpty() && dataElements.peek().getType().equals("applicationerror"))) {\r
currentElement = new ServiceError(); \r
// Service Proxy extras \r
} else if (localName.equals("auth")) { \r