BZ-1047911 : fixing NPE when convering null into property