Fixed issue where item state could get stuck upon error on updates #692