Fix further regressions in the error handling changes
(r1600449 and r1600495)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1600580 13f79535-47bb-0310-9956-ffa450edef68