Various fixes to prevent error cascading in recent clients.