Rep 997

This should clear up the 500s for bad URIs
Was neccessary their was a bug in MockHttpServletResponse in the older version.