Fixed issues with fit error passing. Refs #8646.
Merge branch 'feature/8646_refactor_fitpeak' into develop