Add back the NPE check for now since the testsuite confirms it with all connectors.
http://ci.apache.org/builders/tomcat-trunk/builds/224/steps/compile_1/logs/stdio

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