diff --git a/snapcraft.yaml b/snapcraft.yaml
index 71e8ccdf..3388c16c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -42,7 +42,7 @@ parts:
     plugin: python
     source-type: git
     source: https://git.launchpad.net/curtin
-    source-commit: 809817fdac257de1769e385a42aeaf3d5bcc2c60
+    source-commit: f13edc1ac71dde678149b4918ee923b25a1b7039
     build-packages:
       - shared-mime-info
       - zlib1g-dev
diff --git a/subiquity/server/apt.py b/subiquity/server/apt.py
index 88ca5030..ef6564f8 100644
--- a/subiquity/server/apt.py
+++ b/subiquity/server/apt.py
@@ -126,7 +126,9 @@ class AptConfigurer:
                 self.tpath('etc/apt/sources.list'),
                 self.tpath('etc/apt/sources.list.d/original.list'))
         else:
-            os.unlink(self.tpath('etc/apt/apt.conf.d/90curtin-aptproxy'))
+            proxy_path = self.tpath('etc/apt/apt.conf.d/90curtin-aptproxy')
+            if os.path.exists(proxy_path):
+                os.unlink(proxy_path)
             await self.setup_overlay(self.tpath('var/lib/apt/lists'))
 
         codename = lsb_release()['codename']