avoid NPE when no property set
Merge remote-tracking branch 'origin/master'