Fixed issue with null assignment to field with has one relationship (thx peter.z)