The deadlock is a regression due to login phase inclusion. Not sure about the NPE, it might have always existed.