Try more permissive error handling. No promises this will stay.