4 files changed, 7 insertions, 5 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index cf20c6eb..a5d022e9 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -42,7 +42,8 @@ from leap.gui.statuspanel import StatusPanelWidget
 from leap.services.eip.eipbootstrapper import EIPBootstrapper
 from leap.services.eip.eipconfig import EIPConfig
 from leap.services.eip.providerbootstrapper import ProviderBootstrapper
-from leap.services.soledad.soledadbootstrapper import SoledadBootstrapper
+# XXX: comment out soledad temporarily to avoid problem in Windows, issue #2932
+# from leap.services.soledad.soledadbootstrapper import SoledadBootstrapper
 from leap.services.mail.smtpbootstrapper import SMTPBootstrapper
 from leap.platform_init import IS_WIN
 from leap.platform_init.initializers import init_platform
diff --git a/src/leap/gui/statuspanel.py b/src/leap/gui/statuspanel.py
index 19f84d4c..62a22725 100644
--- a/src/leap/gui/statuspanel.py
+++ b/src/leap/gui/statuspanel.py
@@ -177,11 +177,11 @@ class StatusPanelWidget(QtGui.QWidget):
         Updates the download/upload labels based on the data provided
         by the VPN thread
         """
-        upload = float(data[VPNManager.TUNTAP_WRITE_KEY])
+        upload = float(data[VPNManager.TUNTAP_WRITE_KEY] or "0")
         upload = upload / 1000.0
         upload_str = "%12.2f Kb" % (upload,)
         self.ui.lblUpload.setText(upload_str)
-        download = float(data[VPNManager.TUNTAP_READ_KEY])
+        download = float(data[VPNManager.TUNTAP_READ_KEY] or "0")
         download = download / 1000.0
         download_str = "%12.2f Kb" % (download,)
         self.ui.lblDownload.setText(download_str)
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py
index af77c146..ef73ed94 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/services/eip/vpnlaunchers.py
@@ -478,7 +478,8 @@ class DarwinVPNLauncher(VPNLauncher):
         gateway_selector = VPNGatewaySelector(eipconfig)
         gateways = gateway_selector.get_gateways()
 
-        logger.debug("Using gateways ips: {}".format(', '.join(gateways)))
+        logger.debug("Using gateways ips: {gw}".format(
+            gw=', '.join(gateways)))
 
         for gw in gateways:
             args += ['--remote', gw, '1194', 'udp']
diff --git a/src/leap/services/eip/vpnprocess.py b/src/leap/services/eip/vpnprocess.py
index f1d06943..d9fa85a6 100644
--- a/src/leap/services/eip/vpnprocess.py
+++ b/src/leap/services/eip/vpnprocess.py
@@ -289,7 +289,7 @@ class VPNManager(object):
             self._tn.write("quit\n")
             self._tn.read_all()
         self._tn.get_socket().close()
-        del self._tn
+        self._tn = None
 
     def _connect_management(self, socket_host, socket_port):
         """