Merge "Fix waiters to raise on resources going to ERROR"