diff --git a/src/main/folder-watcher.js b/src/main/folder-watcher.js
index d5e81f22..ccf867a3 100644
--- a/src/main/folder-watcher.js
+++ b/src/main/folder-watcher.js
@@ -1,3 +1,4 @@
+const ipc = require('electron').ipcMain
 const chokidar = require('chokidar')
 const log = require('./log')
 
@@ -14,7 +15,6 @@ class FolderWatcher {
   }
 
   start () {
-    log('--- FOLDER WATCHER --> START')
     // Stop watching previous folder before
     // start watching a new one.
     if (this.watching) this.stop()
@@ -30,7 +30,7 @@ class FolderWatcher {
     this.watcher = chokidar.watch(glob, options)
     this.watcher
       .on('add', (path) => {
-        log('-- torrent added: ', path)
+        log('Folder Watcher: added torrent: ', path)
         this.window.dispatch('addTorrent', path)
       })
 
@@ -38,7 +38,7 @@ class FolderWatcher {
   }
 
   stop () {
-    log('--- FOLDER WATCHER --> STOP')
+    log('Folder Watcher: stop.')
     if (!this.watching) return
     this.watcher.close()
     this.watching = false
diff --git a/src/main/ipc.js b/src/main/ipc.js
index 432a480f..4c0a3d42 100644
--- a/src/main/ipc.js
+++ b/src/main/ipc.js
@@ -67,7 +67,7 @@ function init () {
   })
 
   /**
-   * Events
+   * Player Events
    */
 
   ipc.on('onPlayerOpen', function () {
@@ -115,13 +115,25 @@ function init () {
     thumbar.onPlayerPause()
   })
 
+  /**
+   * Folder Watcher Events
+   */
+
   ipc.on('startFolderWatcher', function () {
-    log('--- Torrent Watcher started')
+    if (!modules['folderWatcher']) {
+      log('IPC ERR: folderWatcher module is not defined.')
+      return
+    }
+
     modules['folderWatcher'].start()
   })
 
   ipc.on('stopFolderWatcher', function () {
-    log('--- Torrent Watcher stop')
+    if (!modules['folderWatcher']) {
+      log('IPC ERR: folderWatcher module is not defined.')
+      return
+    }
+
     modules['folderWatcher'].stop()
   })