null-one-to-one error fix