3 files changed, 7 insertions, 2 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 353faa7f4..2e80e520b 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -35,7 +35,7 @@ module.paths.unshift(
 );
 
 const { app } = remote;
-const fetch = remote.require('electron-fetch');
+const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
diff --git a/src/index.js b/src/index.js
index 5ba901b89..5fbe3bc4f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -19,6 +19,11 @@ const debug = require('debug')('App');
 let mainWindow;
 let willQuitApp = false;
 
+// DEV MODE: Save user data into FranzDev
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+
 // Ensure that the recipe directory exists
 fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
 fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json'));
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index d8519c609..9270a6481 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -68,7 +68,7 @@ export default class SettingsStore extends Store {
 
   // Helper
   _migrate() {
-    const legacySettings = localStorage.getItem('app');
+    const legacySettings = localStorage.getItem('app') || {};
 
     if (!this.all.migration['5.0.0-beta.17-settings']) {
       this.actions.settings.update({