diff --git a/subiquity/server/snapdapi.py b/subiquity/server/snapdapi.py
index f82e2adc..e956b2cc 100644
--- a/subiquity/server/snapdapi.py
+++ b/subiquity/server/snapdapi.py
@@ -166,4 +166,6 @@ async def post_and_wait(client, meth, *args, **kw):
         result = await client.v2.changes[change_id].GET()
         if result.status == TaskStatus.DONE:
             return result.data
+        elif result.status == TaskStatus.ERROR:
+            raise aiohttp.ClientError(result.err)
         await asyncio.sleep(0.1)