[[ Bug 13312 ]] Ensure getters and setters are not called when they are nil
Merge pull request #1113 from runrevali/bugfix-13312

[[ Bug 13312 ]] Ensure getters and setters are not called when they are ...