Nullchecks added.