diff --git a/src/public/javascripts/entities/branch.js b/src/public/javascripts/entities/branch.js
index 2f68b11db..396e1c229 100644
--- a/src/public/javascripts/entities/branch.js
+++ b/src/public/javascripts/entities/branch.js
@@ -19,7 +19,7 @@ class Branch {
 
     /** @returns {NoteShort} */
     async getNote() {
-        return await this.treeCache.getNote(this.noteId);
+        return this.treeCache.getNote(this.noteId);
     }
 
     /** @returns {boolean} true if it's top level, meaning its parent is root note */
diff --git a/src/public/javascripts/services/tree_builder.js b/src/public/javascripts/services/tree_builder.js
index 83e5aa10c..70522af7c 100644
--- a/src/public/javascripts/services/tree_builder.js
+++ b/src/public/javascripts/services/tree_builder.js
@@ -65,6 +65,11 @@ async function getIcon(note) {
 
 async function prepareNode(branch) {
     const note = await branch.getNote();
+
+    if (!note) {
+        console.log(`Branch has no note: ${branch}`);
+    }
+
     const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
     const hoistedNoteId = await hoistedNoteService.getHoistedNoteId();
 
diff --git a/src/public/javascripts/services/tree_cache.js b/src/public/javascripts/services/tree_cache.js
index fade66e5a..ff8a910c2 100644
--- a/src/public/javascripts/services/tree_cache.js
+++ b/src/public/javascripts/services/tree_cache.js
@@ -161,6 +161,11 @@ class TreeCache {
     /** @return {Promise<NoteShort>} */
     async getNote(noteId, silentNotFoundError = false) {
         if (noteId === 'none') {
+            console.log(`No 'none' note.`);
+            return null;
+        }
+        else if (!noteId) {
+            console.log(`Falsy noteId ${noteId}, returning null.`);
             return null;
         }