Additional null checks and comments