diff --git a/ci.js b/ci.js
index 49a122f4..350996a5 100644
--- a/ci.js
+++ b/ci.js
@@ -120,6 +120,15 @@ async function getResults(driver) {
   return {specResults: flatten(specResults), failedSuiteResults: flatten(failedSuiteResults)};
 }
 
+function cleanup() {
+  return Promise.all([
+    driver ? driver.close() : true,
+    new Promise(resolve => server ? server.close(resolve) : resolve())
+  ]).catch(error => {
+    console.error(error);
+  });
+}
+
 (async function () {
   await new Promise(resolve => {
     console.log("Creating an express app for browers to run the tests...")
@@ -202,7 +211,6 @@ async function getResults(driver) {
   if (useSauce) {
     driver.executeScript(`sauce:job-result=${process.exitCode === 0}`);
   }
-})().finally(() => {
-  return Promise.all([driver.close(), new Promise(resolve => server.close(resolve))]);
-});
-
+})().catch(error => {
+  console.error(error);
+}).then(cleanup);