- made sure that the properties are reseted even on error