kkolinko review: Extend NPE protection

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