new api support
Updating error handling