Force logout when exception type 9 is raised
Merge from upstream