diff --git a/storage/swift.py b/storage/swift.py
index 808794868..eded1b25f 100644
--- a/storage/swift.py
+++ b/storage/swift.py
@@ -120,6 +120,11 @@ class SwiftStorage(BaseStorage):
     path = self._normalize_path(path)
     try:
       return self._get_connection().head_object(self._swift_container, path)
+    except ClientException as ce:
+      if ce.http_status != 404:
+        logger.exception('Could not head object at path %s: %s', path, ex)
+
+      return None
     except Exception as ex:
       logger.exception('Could not head object at path %s: %s', path, ex)
       return None