Stricter error handling