Feature/en 1831

We should confirm the response is empty. What if it returned an error, we wouldn't know.