Correct the error.  Refs #6918.
Merge remote branch 'origin/feature/6918_correct_error'