Better handling of API errors, API now deals with continue differently