increased --max-objects and improved error handling