Fixed exceptions added to the API