Fix for previous commit that caused cyclic redirects.
Fix for NPE in session cleaner job.