diff --git a/daemon-common/zkhandler.py b/daemon-common/zkhandler.py
index 29d14c57..6f83799f 100644
--- a/daemon-common/zkhandler.py
+++ b/daemon-common/zkhandler.py
@@ -57,10 +57,11 @@ class ZKConnection(object):
                 schema_version = 0
             zkhandler.schema.load(schema_version, quiet=True)
 
-            ret = function(zkhandler, *args, **kwargs)
-
-            zkhandler.disconnect()
-            del zkhandler
+            try:
+                ret = function(zkhandler, *args, **kwargs)
+            finally:
+                zkhandler.disconnect()
+                del zkhandler
 
             return ret