Check for null results from getTypeForAccount. am: 0325600174
am: 7627284b10

Change-Id: I80f37e33a50649b43f560cae4a08e326bf49b97c