[BR/JM][00000000] Fix NPE in set-property!