Improving error-handling on front.
Merge pull request #791 from cschroed-usgs/CCH-1099

Improving error-handling on front.