Fix NPE on account-switch