diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
index 8986f1657..ddb2e7646 100644
--- a/src/virtManager/addhardware.py
+++ b/src/virtManager/addhardware.py
@@ -376,6 +376,7 @@ class vmmAddHardware(vmmGObjectUI):
     def reset_state(self):
         # Storage init
         label_widget = self.window.get_widget("phys-hd-label")
+        label_widget.set_markup("")
         if not self.host_storage_timer:
             self.host_storage_timer = util.safe_timeout_add(3 * 1000,
                                                 uihelpers.host_space_tick,
diff --git a/src/virtManager/create.py b/src/virtManager/create.py
index e94d9248b..1a8d6b807 100644
--- a/src/virtManager/create.py
+++ b/src/virtManager/create.py
@@ -348,6 +348,7 @@ class vmmCreate(vmmGObjectUI):
 
         # Storage
         label_widget = self.window.get_widget("phys-hd-label")
+        label_widget.set_markup("")
         if not self.host_storage_timer:
             self.host_storage_timer = util.safe_timeout_add(3 * 1000,
                                                     uihelpers.host_space_tick,
diff --git a/src/virtManager/uihelpers.py b/src/virtManager/uihelpers.py
index e7707f6ec..c6cae5ea9 100644
--- a/src/virtManager/uihelpers.py
+++ b/src/virtManager/uihelpers.py
@@ -85,7 +85,11 @@ def host_disk_space(conn):
     return float(avail / 1024.0 / 1024.0 / 1024.0)
 
 def host_space_tick(conn, widget):
-    max_storage = host_disk_space(conn)
+    try:
+        max_storage = host_disk_space(conn)
+    except:
+        logging.exception("Error determining host disk space")
+        return 0
 
     def pretty_storage(size):
         return "%.1f Gb" % float(size)