Make error handling more lenient