diff --git a/docusaurus-init/README.md b/docusaurus-init/README.md
index 6d0830048e..50fe3eb1b8 100644
--- a/docusaurus-init/README.md
+++ b/docusaurus-init/README.md
@@ -1,6 +1,6 @@
 ## `docusaurus-init`
 
-An initialization script for [Docusaurus](https://docusuarus.io).
+An initialization script for [Docusaurus](https://docusaurus.io).
 
 ### What does it do?
 
diff --git a/examples/basics/core/Footer.js b/examples/basics/core/Footer.js
index c6c58b1623..1cb53c4ab3 100644
--- a/examples/basics/core/Footer.js
+++ b/examples/basics/core/Footer.js
@@ -14,12 +14,14 @@ class Footer extends React.Component {
       <footer className="nav-footer" id="footer">
         <section className="sitemap">
           <a href={this.props.config.baseUrl} className="nav-home">
-            <img
-              src={this.props.config.baseUrl + this.props.config.footerIcon}
-              alt={this.props.config.title}
-              width="66"
-              height="58"
-            />
+            {this.props.config.footerIcon && (
+              <img
+                src={this.props.config.baseUrl + this.props.config.footerIcon}
+                alt={this.props.config.title}
+                width="66"
+                height="58"
+              />
+            )}
           </a>
           <div>
             <h5>Docs</h5>
diff --git a/examples/basics/pages/en/index.js b/examples/basics/pages/en/index.js
index c341150613..37755372c5 100755
--- a/examples/basics/pages/en/index.js
+++ b/examples/basics/pages/en/index.js
@@ -167,6 +167,9 @@ const Description = props => (
 );
 
 const Showcase = props => {
+  if ((siteConfig.users||[]).length === 0) {
+    return null;
+  }
   const showcase = siteConfig.users
     .filter(user => {
       return user.pinned;
diff --git a/lib/core/nav/HeaderNav.js b/lib/core/nav/HeaderNav.js
index 2e127439e9..1532be3b91 100644
--- a/lib/core/nav/HeaderNav.js
+++ b/lib/core/nav/HeaderNav.js
@@ -188,10 +188,12 @@ class HeaderNav extends React.Component {
         <div className="headerWrapper wrapper">
           <header>
             <a href={this.props.baseUrl}>
-              <img
-                className="logo"
-                src={this.props.baseUrl + siteConfig.headerIcon}
-              />
+              {siteConfig.headerIcon && (
+                <img
+                  className="logo"
+                  src={this.props.baseUrl + siteConfig.headerIcon}
+                />
+              )}
               {!this.props.config.disableHeaderTitle && (
                 <h2 className="headerTitle">{this.props.title}</h2>
               )}