IDGEN-37 - Error 500 when running on recent versions of Tomcat