[WIP] Fixed error when a property has no value, only attributes
Need to rebase to rebase this on master it seems....