Tweaked upstart error handling.