Fix for possible NPE on ServletContext