[FIX] check for undefined property (RT-2347)
Merge pull request #1861 from darkdarkdragon/develop-RT-2347-fix

[FIX] check for undefined property (RT-2347)