Fix condition on nullable property

[asmirnov82]

fixes #1333
similar to #1330

[ebozduman]

@assmirnov82

This code has changed quite a lot in PR#1320, and the if clause is not there anymore.
PR#1320 comes with a more comprehensive fix.
I suggest you to wait for PR#1320 to be merged and then you can try it out to see if the problem you've seen still insists.

[ebozduman]

@asmirnov82
#1320 is merged.
Please resolve the conflicts and check/test if the problem is still there.
You can close the PR together with the issues, #1330 and #1333, if you cannot reproduce the issues.

[ebozduman]

@asmirnov82
I started looking into the conflicts, but your change happens in a code that is no longer there.
So, this PR became obsolete.
Closing it.