diff --git a/README.md b/README.md
index 24a00dc3..b903750f 100755
--- a/README.md
+++ b/README.md
@@ -41,6 +41,16 @@ Tockler is migrating from Aurelia to React. So some things may not work right no
 ![Summary](https://github.com/MayGo/tockler/raw/master/screenshots/tockler-summary.png 'Summary')
 ![Tray window](https://github.com/MayGo/tockler/raw/master/screenshots/tockler-tray.png 'Tray window')
 
+# Debugging
+
+## Logs
+
+By default, tockler writes logs to the following locations:
+
+on Linux: ~/.config/tockler/logs/main.log
+on macOS: ~/Library/Logs/tockler/main.log
+on Windows: %USERPROFILE%\AppData\Roaming\tockler\logs\main.log
+
 # Donations
 
 This project needs you! If you would like to support this project's further development, feel free to donate.
diff --git a/electron/app/services/app-setting-service.ts b/electron/app/services/app-setting-service.ts
index 374e6f8f..3548f2c4 100755
--- a/electron/app/services/app-setting-service.ts
+++ b/electron/app/services/app-setting-service.ts
@@ -11,7 +11,7 @@ export class AppSettingService {
         const appSetting: AppSetting = await AppSetting.create(appSettingAttributes);
 
         const { name } = appSettingAttributes;
-        this.cache[name] = appSettingAttributes;
+        this.cache[name] = appSetting;
         this.logger.info(`Created appSetting with title ${appSettingAttributes.name}.`);
         return appSetting;
     }
diff --git a/electron/app/services/settings-service.ts b/electron/app/services/settings-service.ts
index cf30e56a..954236bd 100755
--- a/electron/app/services/settings-service.ts
+++ b/electron/app/services/settings-service.ts
@@ -17,9 +17,12 @@ export class SettingsService {
             where: {
                 name: name,
             },
+            defaults: {
+                name,
+            },
         });
 
-        this.logger.debug(`Setting ${name} to cache:`, item.toJSON());
+        this.logger.debug(`Setting ${name} to cache:`, item && item.toJSON());
         this.cache[name] = item;
 
         return item;
@@ -82,6 +85,11 @@ export class SettingsService {
 
         if (settingsItem.jsonData.id) {
             let logItem = await TrackItem.findByPk(settingsItem.jsonData.id);
+            if (!logItem) {
+                this.logger.error(`No Track item found by pk: ${settingsItem.jsonData.id}`);
+                return null;
+            }
+
             return logItem.toJSON();
         }
 
diff --git a/electron/app/state-manager.ts b/electron/app/state-manager.ts
index 040488ff..4389e435 100755
--- a/electron/app/state-manager.ts
+++ b/electron/app/state-manager.ts
@@ -57,7 +57,7 @@ export class StateManager {
         const item: TrackItem = await this.createNewRunningTrackItem(rawItem);
         logger.info('log-item-started', item.toJSON());
         await this.setLogTrackItemMarkedAsRunning(item);
-        // event.sender.send('log-item-started', item.toJSON());
+
         sendToTrayWindow('log-item-started', JSON.stringify(item.toJSON()));
     }
 
@@ -67,15 +67,14 @@ export class StateManager {
         if (logItem) {
             this.logTrackItemMarkedAsRunning = logItem;
             this.setCurrentTrackItem(logItem);
-        } else {
-            logger.info('No runnin log item');
-        }
 
-        if (this.logTrackItemMarkedAsRunning) {
             logger.info('Restored running LogTrackItem:', logItem.toJSON());
-        }
 
-        return logItem;
+            return logItem;
+        } else {
+            logger.info('No runnin log item');
+        }
+        return null;
     }
 
     getLogTrackItemMarkedAsRunning() {
diff --git a/electron/package.json b/electron/package.json
index 7bfb66fa..1e1a6026 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tockler",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "description": "Automatically track applications usage and working time",
     "author": "Maigo Erit <maigo.erit@gmail.com>",
     "license": "GPL-2.0",