Add nulling and a check.