[BUG #8471] Added property checks.
[BUG #8471] Updated nullable handling