Remove adding error tag. Closes #1231