Only set a property if it's non-empty