Refs #7224  Fixed a problems and more catches

It is possible( very unlikely) for a peak to be deleted from another thread
Merge remote branch 'origin/bugfix/7224_getPeakException'