Add ALL the null checks!