Fixed: Errors not catched on change when the __need_change__ flag is set
(cherry picked from commit 4cc46b2)
(cherry picked from commit e4eae4b)