added a guard for nulls on account creation