Refs #8587 Fix bad logic causing an exception to be incorrectly thrown
Merge branch 'feature/8587_DOS_port' into develop