Merge "Dont throw exception if admin is null"