Fixed the bug.  Refs #7345.
Merge remote branch 'origin/bugfix/7345_findpeak_exception'