Issue #5106: Restore error modification