Increased wait time and error handling