Fix not trying to (un)set properties after first error