diff --git a/lib/core/DocsSidebar.js b/lib/core/DocsSidebar.js
index d49604028e..83ab10d5a7 100644
--- a/lib/core/DocsSidebar.js
+++ b/lib/core/DocsSidebar.js
@@ -18,6 +18,10 @@ class DocsSidebar extends React.Component {
   render() {
     let sidebar = this.props.metadata.sidebar;
     let docsCategories = readCategories(sidebar);
+    const categoryName = docsCategories[this.props.metadata.language][0].name;
+    if (!categoryName) {
+      return null;
+    }
     return (
       <Container className="docsNavContainer" id="docsNav" wrapper={false}>
         <SideNav
diff --git a/lib/server/readMetadata.js b/lib/server/readMetadata.js
index efc31d8f65..838c73399c 100644
--- a/lib/server/readMetadata.js
+++ b/lib/server/readMetadata.js
@@ -123,18 +123,20 @@ function processMetadata(file) {
   const order = readSidebar();
   const id = metadata.localized_id;
 
-  metadata.sidebar = order[id].sidebar;
-  metadata.category = order[id].category;
+  if (order[id]) {
+    metadata.sidebar = order[id].sidebar;
+    metadata.category = order[id].category;
 
-  if (order[id].next) {
-    metadata.next_id = order[id].next;
-    metadata.next = language + "-" + order[id].next;
+    if (order[id].next) {
+      metadata.next_id = order[id].next;
+      metadata.next = language + "-" + order[id].next;
+    }
+    if (order[id].previous) {
+      metadata.previous_id = order[id].previous;
+      metadata.previous = language + "-" + order[id].previous;
+    }
   }
-  if (order[id].previous) {
-    metadata.previous_id = order[id].previous;
-    metadata.previous = language + "-" + order[id].previous;
-  }
-
+  
   return { metadata, rawContent: rawContent };
 }