Moving all error processing enhancements to a new branch