Small changes to error reporting
Authored by: doug_gillespie 2016-08-18
Parent: [r152]
Child: [r154]