diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 3936606..3497ac5 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -678,8 +678,10 @@ def main():
     except:
         import traceback
         traceback.print_exc()
+    finally:
+        if hasattr(tinfoil, 'shutdown'):
+            tinfoil.shutdown()
 
-    tinfoil.shutdown()
     shutil.rmtree(tempdir)
     sys.exit(0)