Merge "Gracefully handle "needs init" transport errors at finish"