Additional null checks