Don't use non existing variable references
Merge pull request #4 from onthebeach/fix-has-one-optional

Don't use non existing variable references