Fixed some small issues found during production test with error reporting and logging.