Commit #535, retain original error info on new error thrown.