Handle failed builds gracefully

Just some cleanup for when builds fail on Public Cloud. Now works and respects attempts and intervals.