Align with Tomcat
Exclude
Prevent NPE with session