diff --git a/browser/main/lib/dataApi/createNote.js b/browser/main/lib/dataApi/createNote.js
index 5d984c49..b98f6832 100644
--- a/browser/main/lib/dataApi/createNote.js
+++ b/browser/main/lib/dataApi/createNote.js
@@ -59,6 +59,7 @@ function createNote (storageKey, input) {
       while (!isUnique) {
         try {
           sander.statSync(path.join(storage.path, 'notes', key + '.cson'))
+          key = keygen()
         } catch (err) {
           if (err.code === 'ENOENT') {
             isUnique = true
diff --git a/browser/main/lib/dataApi/updateFolder.js b/browser/main/lib/dataApi/updateFolder.js
index b6dd4485..44250b2e 100644
--- a/browser/main/lib/dataApi/updateFolder.js
+++ b/browser/main/lib/dataApi/updateFolder.js
@@ -41,6 +41,7 @@ function updateFolder (storageKey, folderKey, input) {
   return resolveStorageData(targetStorage)
     .then(function updateFolder (storage) {
       let targetFolder = _.find(storage.folders, {key: folderKey})
+      if (targetFolder == null) throw new Error('Target folder doesn\'t exist.')
       targetFolder.name = input.name
       targetFolder.color = input.color
 
diff --git a/tests/dataApi/deleteNote.js b/tests/dataApi/deleteNote.js
index 6ced22df..b22e5de2 100644
--- a/tests/dataApi/deleteNote.js
+++ b/tests/dataApi/deleteNote.js
@@ -22,7 +22,7 @@ test.beforeEach((t) => {
   localStorage.setItem('storages', JSON.stringify([t.context.storage.cache]))
 })
 
-test.serial('Create a note', (t) => {
+test.serial('Delete a note', (t) => {
   const storageKey = t.context.storage.cache.key
   const folderKey = t.context.storage.json.folders[0].key
 
diff --git a/tests/dataApi/updateNote.js b/tests/dataApi/updateNote.js
index 5f90fb10..63b74dbb 100644
--- a/tests/dataApi/updateNote.js
+++ b/tests/dataApi/updateNote.js
@@ -22,7 +22,7 @@ test.beforeEach((t) => {
   localStorage.setItem('storages', JSON.stringify([t.context.storage.cache]))
 })
 
-test.serial('Create a note', (t) => {
+test.serial('Update a note', (t) => {
   const storageKey = t.context.storage.cache.key
   const folderKey = t.context.storage.json.folders[0].key