diff --git a/yocto_console_view/src/module/main.module.js b/yocto_console_view/src/module/main.module.js
index 357267d..7006780 100644
--- a/yocto_console_view/src/module/main.module.js
+++ b/yocto_console_view/src/module/main.module.js
@@ -228,7 +228,7 @@ class Console {
         const builders_with_builds = [];
         let builderids_with_builds = "";
         for (let builder of Array.from(all_builders)) {
-            if (builder.hasBuild) {
+            if (builder.hasBuild && builder.name != 'indexing') {
                 builders_with_builds.push(builder);
                 builderids_with_builds += `.${builder.builderid}`;
             }
@@ -373,7 +373,9 @@ class Console {
 
         }
 
-        change.buildersById[build.builderid].builds.push(build);
+        if (build.builderid in change.buildersById) {
+            change.buildersById[build.builderid].builds.push(build);
+        }
     }
 
     makeFakeChange(revision, when_timestamp, comments) {