more nullchecks