Added nullchecks