Bug Fixs

* Fix on a tricky bug possibly causing a deadlock upon class loading
* Minor bug fixs regarding a possible NullPointerException, maintaining locale upon redirect