Refs #8587 Remove unnecessary exception.
Merge branch 'feature/8587_DOS_port' into develop