manually re-apply changes for the new error handling mechanism