tweaked reporting of error log
Merge commit '1edf2' into develop