diff --git a/.travis.yml b/.travis.yml
index 35c94108..9e16ef5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -217,6 +217,7 @@ jobs:
         - ccache
         - directories:
           - $HOME/Qt
+          - $HOME/.ccache
 
 # ------------------------------------------------------
     - name: Android
diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index 08e6c40a..913299c7 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -80,7 +80,12 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
             stdOut += data + "\n";
         };
 
-        m_serverController->runContainerScript(credentials, container, script, cbReadStdOut);
+        e = m_serverController->runContainerScript(credentials, container, script, cbReadStdOut);
+        if (errorCode && e) {
+            *errorCode = e;
+            return connData;
+        }
+
         stdOut.replace("AllowedIPs = ", "");
         stdOut.replace("/32", "");
         QStringList ips = stdOut.split("\n", Qt::SkipEmptyParts);