Better shell error reporting

On shell errors, report the original command, and include stderr in the error report.