BZ-1047911 : fixing NPE when convering null into property
(cherry picked from commit 8c1fe833a226f0fabe2b0821eba44790fb9e112b)