Fix of NPE, account deletion.