Additional nullchecks