diff --git a/lib/gui/app.js b/lib/gui/app.js
index 569ff17a..f07547b6 100644
--- a/lib/gui/app.js
+++ b/lib/gui/app.js
@@ -93,65 +93,66 @@ app.run(() => {
     version: currentVersion
   });
 
-  settings.load();
-
-  const shouldCheckForUpdates = updateNotifier.shouldCheckForUpdates({
-    currentVersion,
-    lastSleptUpdateNotifier: settings.get('lastSleptUpdateNotifier'),
-    lastSleptUpdateNotifierVersion: settings.get('lastSleptUpdateNotifierVersion')
-  });
-
-  const currentReleaseType = release.getReleaseType(currentVersion);
-  const updatesEnabled = settings.get('updatesEnabled');
-
-  if (!shouldCheckForUpdates || !updatesEnabled) {
-    analytics.logEvent('Not checking for updates', {
-      shouldCheckForUpdates,
-      updatesEnabled,
-      releaseType: currentReleaseType
+  settings.load().then(() => {
+    const shouldCheckForUpdates = updateNotifier.shouldCheckForUpdates({
+      currentVersion,
+      lastSleptUpdateNotifier: settings.get('lastSleptUpdateNotifier'),
+      lastSleptUpdateNotifierVersion: settings.get('lastSleptUpdateNotifierVersion')
     });
-    return;
-  }
 
-  const updateSemverRange = packageJSON.updates.semverRange;
-  const includeUnstableChannel = settings.get('includeUnstableUpdateChannel');
+    const currentReleaseType = release.getReleaseType(currentVersion);
+    const updatesEnabled = settings.get('updatesEnabled');
 
-  analytics.logEvent('Checking for updates', {
-    currentVersion,
-    releaseType: currentReleaseType,
-    updateSemverRange,
-    includeUnstableChannel
-  });
-
-  s3Packages.getLatestVersion(currentReleaseType, {
-    range: updateSemverRange,
-    includeUnstableChannel
-  }).then((latestVersion) => {
-    if (semver.gte(currentVersion, latestVersion || '0.0.0')) {
-      analytics.logEvent('Update notification skipped', {
-        reason: 'Latest version'
+    if (!shouldCheckForUpdates || !updatesEnabled) {
+      analytics.logEvent('Not checking for updates', {
+        shouldCheckForUpdates,
+        updatesEnabled,
+        releaseType: currentReleaseType
       });
+
       return Bluebird.resolve();
     }
 
-    // In case the internet connection is not good and checking the
-    // latest published version takes too long, only show notify
-    // the user about the new version if he didn't start the flash
-    // process (e.g: selected an image), otherwise such interruption
-    // might be annoying.
-    if (selectionState.hasImage()) {
-      analytics.logEvent('Update notification skipped', {
-        reason: 'Image selected'
-      });
-      return Bluebird.resolve();
-    }
+    const updateSemverRange = packageJSON.updates.semverRange;
+    const includeUnstableChannel = settings.get('includeUnstableUpdateChannel');
 
-    analytics.logEvent('Notifying update', {
-      latestVersion
+    analytics.logEvent('Checking for updates', {
+      currentVersion,
+      releaseType: currentReleaseType,
+      updateSemverRange,
+      includeUnstableChannel
     });
 
-    return updateNotifier.notify(latestVersion, {
-      allowSleepUpdateCheck: currentReleaseType === release.RELEASE_TYPE.PRODUCTION
+    return s3Packages.getLatestVersion(currentReleaseType, {
+      range: updateSemverRange,
+      includeUnstableChannel
+    }).then((latestVersion) => {
+      if (semver.gte(currentVersion, latestVersion || '0.0.0')) {
+        analytics.logEvent('Update notification skipped', {
+          reason: 'Latest version'
+        });
+        return Bluebird.resolve();
+      }
+
+      // In case the internet connection is not good and checking the
+      // latest published version takes too long, only show notify
+      // the user about the new version if he didn't start the flash
+      // process (e.g: selected an image), otherwise such interruption
+      // might be annoying.
+      if (selectionState.hasImage()) {
+        analytics.logEvent('Update notification skipped', {
+          reason: 'Image selected'
+        });
+        return Bluebird.resolve();
+      }
+
+      analytics.logEvent('Notifying update', {
+        latestVersion
+      });
+
+      return updateNotifier.notify(latestVersion, {
+        allowSleepUpdateCheck: currentReleaseType === release.RELEASE_TYPE.PRODUCTION
+      });
     });
   }).catch(exceptionReporter.report);
 });
diff --git a/lib/gui/components/update-notifier.js b/lib/gui/components/update-notifier.js
index e4965d1c..6e70c2e8 100644
--- a/lib/gui/components/update-notifier.js
+++ b/lib/gui/components/update-notifier.js
@@ -124,16 +124,20 @@ exports.notify = (version, options = {}) => {
         sleepUpdateCheck: checkboxChecked || false
       });
     });
-  }).then((results) => {
+  }).tap((results) => {
 
     // Only update the last slept update timestamp if the
     // user ticked the "Remind me again in ..." checkbox,
     // but didn't agree.
     if (results.sleepUpdateCheck && !results.agreed) {
-      settings.set('lastSleptUpdateNotifier', Date.now());
-      settings.set('lastSleptUpdateNotifierVersion', packageJSON.version);
+      return Bluebird.all([
+        settings.set('lastSleptUpdateNotifier', Date.now()),
+        settings.set('lastSleptUpdateNotifierVersion', packageJSON.version)
+      ]);
     }
 
+    return Bluebird.resolve();
+  }).then((results) => {
     analytics.logEvent('Close update modal', {
       sleepUpdateCheck: results.sleepUpdateCheck,
       notifyVersion: version,
diff --git a/lib/gui/models/local-settings.js b/lib/gui/models/local-settings.js
index ab6d7d31..b7ec94b6 100644
--- a/lib/gui/models/local-settings.js
+++ b/lib/gui/models/local-settings.js
@@ -16,6 +16,8 @@
 
 'use strict';
 
+const Bluebird = require('bluebird');
+
 /**
  * @summary Local storage settings key
  * @constant
@@ -28,13 +30,18 @@ const LOCAL_STORAGE_SETTINGS_KEY = 'etcher-settings';
  * @function
  * @public
  *
- * @returns {Object} local settings
+ * @fulfil {Object} - local settings
+ * @returns {Promise}
  *
  * @example
- * const settings = localSettings.readAll();
+ * localSettings.readAll().then((settings) => {
+ *   console.log(settings);
+ * });
  */
 exports.readAll = () => {
-  return JSON.parse(localStorage.getItem(LOCAL_STORAGE_SETTINGS_KEY)) || {};
+  return Bluebird.try(() => {
+    return JSON.parse(localStorage.getItem(LOCAL_STORAGE_SETTINGS_KEY)) || {};
+  });
 };
 
 /**
@@ -43,15 +50,20 @@ exports.readAll = () => {
  * @public
  *
  * @param {Object} settings - settings
+ * @returns {Promise}
  *
  * @example
  * localSettings.writeAll({
  *   foo: 'bar'
+ * }).then(() => {
+ *   console.log('Done!');
  * });
  */
 exports.writeAll = (settings) => {
   const INDENTATION_SPACES = 2;
-  localStorage.setItem(LOCAL_STORAGE_SETTINGS_KEY, JSON.stringify(settings, null, INDENTATION_SPACES));
+  return Bluebird.try(() => {
+    localStorage.setItem(LOCAL_STORAGE_SETTINGS_KEY, JSON.stringify(settings, null, INDENTATION_SPACES));
+  });
 };
 
 /**
@@ -62,9 +74,15 @@ exports.writeAll = (settings) => {
  * @description
  * Exported for testing purposes
  *
+ * @returns {Promise}
+ *
  * @example
- * localSettings.clear();
+ * localSettings.clear().then(() => {
+ *   console.log('Done!');
+ * });
  */
 exports.clear = () => {
-  localStorage.removeItem(LOCAL_STORAGE_SETTINGS_KEY);
+  return Bluebird.try(() => {
+    localStorage.removeItem(LOCAL_STORAGE_SETTINGS_KEY);
+  });
 };
diff --git a/lib/gui/models/settings.js b/lib/gui/models/settings.js
index 42979fee..aefff758 100644
--- a/lib/gui/models/settings.js
+++ b/lib/gui/models/settings.js
@@ -21,6 +21,7 @@
  */
 
 const _ = require('lodash');
+const Bluebird = require('bluebird');
 const localSettings = require('./local-settings');
 const store = require('../../shared/store');
 const errors = require('../../shared/errors');
@@ -39,30 +40,35 @@ const errors = require('../../shared/errors');
  * write issues by rolling back to the previous settings if so.
  *
  * @param {Object} settings - settings
+ * @returns {Promise}
  *
  * @example
- * setSettingsObject({ foo: 'bar' });
+ * setSettingsObject({ foo: 'bar' }).then(() => {
+ *   console.log('Done!');
+ * });
  */
 const setSettingsObject = (settings) => {
   const currentSettings = exports.getAll();
 
-  store.dispatch({
-    type: store.Actions.SET_SETTINGS,
-    data: settings
-  });
-
-  const result = _.attempt(localSettings.writeAll, settings);
-
-  // Revert the application state if writing the data
-  // to the local machine was not successful
-  if (_.isError(result)) {
+  return Bluebird.try(() => {
     store.dispatch({
       type: store.Actions.SET_SETTINGS,
-      data: currentSettings
+      data: settings
+    });
+  }).then(() => {
+
+    // Revert the application state if writing the data
+    // to the local machine was not successful
+    return localSettings.writeAll(settings).catch((error) => {
+      store.dispatch({
+        type: store.Actions.SET_SETTINGS,
+        data: currentSettings
+      });
+
+      throw error;
     });
 
-    throw result;
-  }
+  });
 };
 
 /**
@@ -77,10 +83,16 @@ const DEFAULT_SETTINGS = store.Defaults.get('settings').toJS();
  * @function
  * @public
  *
+ * @returns {Promise}
+ *
  * @example
- * settings.reset();
+ * settings.reset().then(() => {
+ *   console.log('Done!');
+ * });
  */
-exports.reset = _.partial(setSettingsObject, DEFAULT_SETTINGS);
+exports.reset = () => {
+  return setSettingsObject(DEFAULT_SETTINGS);
+};
 
 /**
  * @summary Extend the current settings
@@ -88,20 +100,23 @@ exports.reset = _.partial(setSettingsObject, DEFAULT_SETTINGS);
  * @public
  *
  * @param {Object} settings - settings
+ * @returns {Promise}
  *
  * @example
  * settings.assign({
  *   foo: 'bar'
+ * }).then(() => {
+ *   console.log('Done!');
  * });
  */
 exports.assign = (settings) => {
   if (_.isNil(settings)) {
-    throw errors.createError({
+    return Bluebird.reject(errors.createError({
       title: 'Missing settings'
-    });
+    }));
   }
 
-  setSettingsObject(_.assign(exports.getAll(), settings));
+  return setSettingsObject(_.assign(exports.getAll(), settings));
 };
 
 /**
@@ -109,11 +124,15 @@ exports.assign = (settings) => {
  * @function
  * @public
  *
+ * @returns {Promise}
+ *
  * @example
- * settings.load();
+ * settings.load().then(() => {
+ *   console.log('Done!');
+ * });
  */
 exports.load = () => {
-  exports.assign(localSettings.readAll());
+  return localSettings.readAll().then(exports.assign);
 };
 
 /**
@@ -123,24 +142,27 @@ exports.load = () => {
  *
  * @param {String} key - setting key
  * @param {*} value - setting value
+ * @returns {Promise}
  *
  * @example
- * settings.set('unmountOnSuccess', true);
+ * settings.set('unmountOnSuccess', true).then(() => {
+ *   console.log('Done!');
+ * });
  */
 exports.set = (key, value) => {
   if (_.isNil(key)) {
-    throw errors.createError({
+    return Bluebird.reject(errors.createError({
       title: 'Missing setting key'
-    });
+    }));
   }
 
   if (!_.isString(key)) {
-    throw errors.createError({
+    return Bluebird.reject(errors.createError({
       title: `Invalid setting key: ${key}`
-    });
+    }));
   }
 
-  exports.assign({
+  return exports.assign({
     [key]: value
   });
 };
diff --git a/tests/gui/models/settings.spec.js b/tests/gui/models/settings.spec.js
index c4b6a536..c36fdd0e 100644
--- a/tests/gui/models/settings.spec.js
+++ b/tests/gui/models/settings.spec.js
@@ -2,6 +2,7 @@
 
 const m = require('mochainon');
 const _ = require('lodash');
+const Bluebird = require('bluebird');
 const store = require('../../../lib/shared/store');
 const settings = require('../../../lib/gui/models/settings');
 const localSettings = require('../../../lib/gui/models/local-settings');
@@ -9,45 +10,52 @@ const localSettings = require('../../../lib/gui/models/local-settings');
 describe('Browser: settings', function() {
 
   beforeEach(function() {
-    settings.reset();
+    return settings.reset();
   });
 
   const DEFAULT_SETTINGS = store.Defaults.get('settings').toJS();
 
   it('should be able to set and read values', function() {
     m.chai.expect(settings.get('foo')).to.be.undefined;
-    settings.set('foo', true);
-    m.chai.expect(settings.get('foo')).to.be.true;
-    settings.set('foo', false);
-    m.chai.expect(settings.get('foo')).to.be.false;
+    return settings.set('foo', true).then(() => {
+      m.chai.expect(settings.get('foo')).to.be.true;
+      return settings.set('foo', false);
+    }).then(() => {
+      m.chai.expect(settings.get('foo')).to.be.false;
+    });
   });
 
   describe('.reset()', function() {
 
     it('should reset the settings to their default values', function() {
       m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
-      settings.set('foo', 1234);
-      m.chai.expect(settings.getAll()).to.not.deep.equal(DEFAULT_SETTINGS);
-      settings.reset();
-      m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
+      return settings.set('foo', 1234).then(() => {
+        m.chai.expect(settings.getAll()).to.not.deep.equal(DEFAULT_SETTINGS);
+        return settings.reset();
+      }).then(() => {
+        m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
+      });
     });
 
     it('should reset the local settings to their default values', function() {
-      settings.set('foo', 1234);
-      m.chai.expect(localSettings.readAll()).to.not.deep.equal(DEFAULT_SETTINGS);
-      settings.reset();
-      m.chai.expect(localSettings.readAll()).to.deep.equal(DEFAULT_SETTINGS);
+      return settings.set('foo', 1234).then(localSettings.readAll).then((data) => {
+        m.chai.expect(data).to.not.deep.equal(DEFAULT_SETTINGS);
+        return settings.reset();
+      }).then(localSettings.readAll).then((data) => {
+        m.chai.expect(data).to.deep.equal(DEFAULT_SETTINGS);
+      });
     });
 
     describe('given the local settings are cleared', function() {
 
       beforeEach(function() {
-        localSettings.clear();
+        return localSettings.clear();
       });
 
       it('should set the local settings to their default values', function() {
-        settings.reset();
-        m.chai.expect(localSettings.readAll()).to.deep.equal(DEFAULT_SETTINGS);
+        return settings.reset().then(localSettings.readAll).then((data) => {
+          m.chai.expect(data).to.deep.equal(DEFAULT_SETTINGS);
+        });
       });
 
     });
@@ -56,73 +64,87 @@ describe('Browser: settings', function() {
 
   describe('.assign()', function() {
 
-    it('should throw if no settings', function() {
-      m.chai.expect(function() {
-        settings.assign();
-      }).to.throw('Missing setting');
+    it('should throw if no settings', function(done) {
+      settings.assign().asCallback((error) => {
+        m.chai.expect(error).to.be.an.instanceof(Error);
+        m.chai.expect(error.message).to.equal('Missing settings');
+        done();
+      });
     });
 
-    it('should throw if setting an array', function() {
-      m.chai.expect(function() {
-        settings.assign({
-          foo: 'bar',
-          bar: [ 1, 2, 3 ]
-        });
-      }).to.throw('Invalid setting value: 1,2,3 for bar');
+    it('should throw if setting an array', function(done) {
+      settings.assign({
+        foo: 'bar',
+        bar: [ 1, 2, 3 ]
+      }).asCallback((error) => {
+        m.chai.expect(error).to.be.an.instanceof(Error);
+        m.chai.expect(error.message).to.equal('Invalid setting value: 1,2,3 for bar');
+        done();
+      });
     });
 
     it('should not override all settings', function() {
-      settings.assign({
+      return settings.assign({
         foo: 'bar',
         bar: 'baz'
+      }).then(() => {
+        m.chai.expect(settings.getAll()).to.deep.equal(_.assign({}, DEFAULT_SETTINGS, {
+          foo: 'bar',
+          bar: 'baz'
+        }));
       });
-
-      m.chai.expect(settings.getAll()).to.deep.equal(_.assign({}, DEFAULT_SETTINGS, {
-        foo: 'bar',
-        bar: 'baz'
-      }));
     });
 
     it('should not store invalid settings to the local machine', function() {
-      m.chai.expect(localSettings.readAll().foo).to.be.undefined;
+      return localSettings.readAll().then((data) => {
+        m.chai.expect(data.foo).to.be.undefined;
 
-      m.chai.expect(() => {
-        settings.assign({
-          foo: [ 1, 2, 3 ]
+        return new Bluebird((resolve) => {
+          settings.assign({
+            foo: [ 1, 2, 3 ]
+          }).asCallback((error) => {
+            m.chai.expect(error).to.be.an.instanceof(Error);
+            m.chai.expect(error.message).to.equal('Invalid setting value: 1,2,3 for foo');
+            return resolve();
+          });
         });
-      }).to.throw('Invalid setting value: 1,2,3');
-
-      m.chai.expect(localSettings.readAll().foo).to.be.undefined;
+      }).then(localSettings.readAll).then((data) => {
+        m.chai.expect(data.foo).to.be.undefined;
+      });
     });
 
     it('should store the settings to the local machine', function() {
-      m.chai.expect(localSettings.readAll().foo).to.be.undefined;
-      m.chai.expect(localSettings.readAll().bar).to.be.undefined;
+      return localSettings.readAll().then((data) => {
+        m.chai.expect(data.foo).to.be.undefined;
+        m.chai.expect(data.bar).to.be.undefined;
 
-      settings.assign({
-        foo: 'bar',
-        bar: 'baz'
+        return settings.assign({
+          foo: 'bar',
+          bar: 'baz'
+        });
+      }).then(localSettings.readAll).then((data) => {
+        m.chai.expect(data.foo).to.equal('bar');
+        m.chai.expect(data.bar).to.equal('baz');
       });
-
-      m.chai.expect(localSettings.readAll().foo).to.equal('bar');
-      m.chai.expect(localSettings.readAll().bar).to.equal('baz');
     });
 
-    it('should not change the application state if storing to the local machine results in an error', function() {
-      settings.set('foo', 'bar');
-      m.chai.expect(settings.get('foo')).to.equal('bar');
+    it('should not change the application state if storing to the local machine results in an error', function(done) {
+      settings.set('foo', 'bar').then(() => {
+        m.chai.expect(settings.get('foo')).to.equal('bar');
 
-      const localSettingsWriteAllStub = m.sinon.stub(localSettings, 'writeAll');
-      localSettingsWriteAllStub.throws(new Error('localSettings error'));
+        const localSettingsWriteAllStub = m.sinon.stub(localSettings, 'writeAll');
+        localSettingsWriteAllStub.returns(Bluebird.reject(new Error('localSettings error')));
 
-      m.chai.expect(() => {
         settings.assign({
           foo: 'baz'
+        }).asCallback((error) => {
+          m.chai.expect(error).to.be.an.instanceof(Error);
+          m.chai.expect(error.message).to.equal('localSettings error');
+          localSettingsWriteAllStub.restore();
+          m.chai.expect(settings.get('foo')).to.equal('bar');
+          done();
         });
-      }).to.throw('localSettings error');
-
-      localSettingsWriteAllStub.restore();
-      m.chai.expect(settings.get('foo')).to.equal('bar');
+      }).catch(done);
     });
 
   });
@@ -135,17 +157,20 @@ describe('Browser: settings', function() {
       };
 
       m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
-      localSettings.writeAll(object);
-      m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
-      settings.load();
-      m.chai.expect(settings.getAll()).to.deep.equal(_.assign({}, DEFAULT_SETTINGS, object));
+
+      return localSettings.writeAll(object).then(() => {
+        m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
+        return settings.load();
+      }).then(() => {
+        m.chai.expect(settings.getAll()).to.deep.equal(_.assign({}, DEFAULT_SETTINGS, object));
+      });
     });
 
     it('should keep the application state intact if there are no local settings', function() {
       m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
-      localSettings.clear();
-      settings.load();
-      m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
+      return localSettings.clear().then(settings.load).then(() => {
+        m.chai.expect(settings.getAll()).to.deep.equal(DEFAULT_SETTINGS);
+      });
     });
 
   });
@@ -154,72 +179,94 @@ describe('Browser: settings', function() {
 
     it('should set an unknown key', function() {
       m.chai.expect(settings.get('foobar')).to.be.undefined;
-      settings.set('foobar', true);
-      m.chai.expect(settings.get('foobar')).to.be.true;
+      return settings.set('foobar', true).then(() => {
+        m.chai.expect(settings.get('foobar')).to.be.true;
+      });
     });
 
-    it('should throw if no key', function() {
-      m.chai.expect(function() {
-        settings.set(null, true);
-      }).to.throw('Missing setting key');
+    it('should reject if no key', function(done) {
+      settings.set(null, true).asCallback((error) => {
+        m.chai.expect(error).to.be.an.instanceof(Error);
+        m.chai.expect(error.message).to.equal('Missing setting key');
+        done();
+      });
     });
 
-    it('should throw if key is not a string', function() {
-      m.chai.expect(function() {
-        settings.set(1234, true);
-      }).to.throw('Invalid setting key: 1234');
+    it('should throw if key is not a string', function(done) {
+      settings.set(1234, true).asCallback((error) => {
+        m.chai.expect(error).to.be.an.instanceof(Error);
+        m.chai.expect(error.message).to.equal('Invalid setting key: 1234');
+        done();
+      });
     });
 
-    it('should throw if setting an object', function() {
-      m.chai.expect(function() {
-        settings.set('foo', {
-          setting: 1
-        });
-      }).to.throw('Invalid setting value: [object Object] for foo');
+    it('should throw if setting an object', function(done) {
+      settings.set('foo', {
+        setting: 1
+      }).asCallback((error) => {
+        m.chai.expect(error).to.be.an.instanceof(Error);
+        m.chai.expect(error.message).to.equal('Invalid setting value: [object Object] for foo');
+        done();
+      });
     });
 
-    it('should throw if setting an array', function() {
-      m.chai.expect(function() {
-        settings.set('foo', [ 1, 2, 3 ]);
-      }).to.throw('Invalid setting value: 1,2,3 for foo');
+    it('should throw if setting an array', function(done) {
+      settings.set('foo', [ 1, 2, 3 ]).asCallback((error) => {
+        m.chai.expect(error).to.be.an.instanceof(Error);
+        m.chai.expect(error.message).to.equal('Invalid setting value: 1,2,3 for foo');
+        done();
+      });
     });
 
     it('should set the key to undefined if no value', function() {
-      settings.set('foo', 'bar');
-      m.chai.expect(settings.get('foo')).to.equal('bar');
-      settings.set('foo');
-      m.chai.expect(settings.get('foo')).to.be.undefined;
+      return settings.set('foo', 'bar').then(() => {
+        m.chai.expect(settings.get('foo')).to.equal('bar');
+        return settings.set('foo');
+      }).then(() => {
+        m.chai.expect(settings.get('foo')).to.be.undefined;
+      });
     });
 
     it('should store the setting to the local machine', function() {
-      m.chai.expect(localSettings.readAll().foo).to.be.undefined;
-      settings.set('foo', 'bar');
-      m.chai.expect(localSettings.readAll().foo).to.equal('bar');
+      return localSettings.readAll().then((data) => {
+        m.chai.expect(data.foo).to.be.undefined;
+        return settings.set('foo', 'bar');
+      }).then(localSettings.readAll).then((data) => {
+        m.chai.expect(data.foo).to.equal('bar');
+      });
     });
 
     it('should not store invalid settings to the local machine', function() {
-      m.chai.expect(localSettings.readAll().foo).to.be.undefined;
+      return localSettings.readAll().then((data) => {
+        m.chai.expect(data.foo).to.be.undefined;
 
-      m.chai.expect(() => {
-        settings.set('foo', [ 1, 2, 3 ]);
-      }).to.throw('Invalid setting value: 1,2,3');
-
-      m.chai.expect(localSettings.readAll().foo).to.be.undefined;
+        return new Bluebird((resolve) => {
+          settings.set('foo', [ 1, 2, 3 ]).asCallback((error) => {
+            m.chai.expect(error).to.be.an.instanceof(Error);
+            m.chai.expect(error.message).to.equal('Invalid setting value: 1,2,3 for foo');
+            return resolve();
+          });
+        });
+      }).then(localSettings.readAll).then((data) => {
+        m.chai.expect(data.foo).to.be.undefined;
+      });
     });
 
-    it('should not change the application state if storing to the local machine results in an error', function() {
-      settings.set('foo', 'bar');
-      m.chai.expect(settings.get('foo')).to.equal('bar');
+    it('should not change the application state if storing to the local machine results in an error', function(done) {
+      settings.set('foo', 'bar').then(() => {
+        m.chai.expect(settings.get('foo')).to.equal('bar');
 
-      const localSettingsWriteAllStub = m.sinon.stub(localSettings, 'writeAll');
-      localSettingsWriteAllStub.throws(new Error('localSettings error'));
+        const localSettingsWriteAllStub = m.sinon.stub(localSettings, 'writeAll');
+        localSettingsWriteAllStub.returns(Bluebird.reject(new Error('localSettings error')));
 
-      m.chai.expect(() => {
-        settings.set('foo', 'baz');
-      }).to.throw('localSettings error');
-
-      localSettingsWriteAllStub.restore();
-      m.chai.expect(settings.get('foo')).to.equal('bar');
+        settings.set('foo', 'baz').asCallback((error) => {
+          m.chai.expect(error).to.be.an.instanceof(Error);
+          m.chai.expect(error.message).to.equal('localSettings error');
+          localSettingsWriteAllStub.restore();
+          m.chai.expect(settings.get('foo')).to.equal('bar');
+          done();
+        });
+      }).catch(done);
     });
 
   });
diff --git a/tests/gui/pages/main.spec.js b/tests/gui/pages/main.spec.js
index bf82293b..63efdb75 100644
--- a/tests/gui/pages/main.spec.js
+++ b/tests/gui/pages/main.spec.js
@@ -241,8 +241,9 @@ describe('Browser: MainPage', function() {
             speed: 100000000000000
           });
 
-          settings.set('unmountOnSuccess', true);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('0%');
+          return settings.set('unmountOnSuccess', true).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('0%');
+          });
         });
 
         it('should handle percentage == 0, type = write, unmountOnSuccess', function() {
@@ -257,8 +258,9 @@ describe('Browser: MainPage', function() {
             speed: 0
           });
 
-          settings.set('unmountOnSuccess', true);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          return settings.set('unmountOnSuccess', true).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          });
         });
 
         it('should handle percentage == 0, type = write, !unmountOnSuccess', function() {
@@ -273,8 +275,9 @@ describe('Browser: MainPage', function() {
             speed: 0
           });
 
-          settings.set('unmountOnSuccess', false);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          return settings.set('unmountOnSuccess', false).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          });
         });
 
         it('should handle percentage == 0, type = check, unmountOnSuccess', function() {
@@ -289,8 +292,9 @@ describe('Browser: MainPage', function() {
             speed: 0
           });
 
-          settings.set('unmountOnSuccess', true);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          return settings.set('unmountOnSuccess', true).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          });
         });
 
         it('should handle percentage == 0, type = check, !unmountOnSuccess', function() {
@@ -305,8 +309,9 @@ describe('Browser: MainPage', function() {
             speed: 0
           });
 
-          settings.set('unmountOnSuccess', false);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          return settings.set('unmountOnSuccess', false).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Starting...');
+          });
         });
 
         it('should handle percentage == 50, type = write, unmountOnSuccess', function() {
@@ -321,8 +326,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', true);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('50%');
+          return settings.set('unmountOnSuccess', true).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('50%');
+          });
         });
 
         it('should handle percentage == 50, type = write, !unmountOnSuccess', function() {
@@ -337,8 +343,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', false);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('50%');
+          return settings.set('unmountOnSuccess', false).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('50%');
+          });
         });
 
         it('should handle percentage == 50, type = check, unmountOnSuccess', function() {
@@ -353,8 +360,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', true);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('50% Validating...');
+          return settings.set('unmountOnSuccess', true).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('50% Validating...');
+          });
         });
 
         it('should handle percentage == 50, type = check, !unmountOnSuccess', function() {
@@ -369,8 +377,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', false);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('50% Validating...');
+          return settings.set('unmountOnSuccess', false).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('50% Validating...');
+          });
         });
 
         it('should handle percentage == 100, type = write, unmountOnSuccess', function() {
@@ -385,8 +394,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', true);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Finishing...');
+          return settings.set('unmountOnSuccess', true).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Finishing...');
+          });
         });
 
         it('should handle percentage == 100, type = write, !unmountOnSuccess', function() {
@@ -401,8 +411,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', false);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Finishing...');
+          return settings.set('unmountOnSuccess', false).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Finishing...');
+          });
         });
 
         it('should handle percentage == 100, type = check, unmountOnSuccess', function() {
@@ -417,8 +428,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', true);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Unmounting...');
+          return settings.set('unmountOnSuccess', true).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Unmounting...');
+          });
         });
 
         it('should handle percentage == 100, type = check, !unmountOnSuccess', function() {
@@ -433,8 +445,9 @@ describe('Browser: MainPage', function() {
             speed: 1000
           });
 
-          settings.set('unmountOnSuccess', false);
-          m.chai.expect(controller.getProgressButtonLabel()).to.equal('Finishing...');
+          return settings.set('unmountOnSuccess', false).then(() => {
+            m.chai.expect(controller.getProgressButtonLabel()).to.equal('Finishing...');
+          });
         });
 
       });