Merge "EditPage: Don't set 'hookaborted' error if the hook set a better error"