Cleaned up upload job error reporting.

Change-Id: I2379d235eb9fed58412c9fefb9cabe56868395b9