diff --git a/templates/header-top-navbar.php b/templates/header-top-navbar.php
index 0ff9f7d..cdff03f 100644
--- a/templates/header-top-navbar.php
+++ b/templates/header-top-navbar.php
@@ -10,7 +10,11 @@
         <?php bloginfo('name'); ?>
       </a>
       <nav id="nav-main" class="nav-collapse" role="navigation">
-        <?php wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav')); ?>
+        <?php
+          if (has_nav_menu('primary_navigation')) {
+            wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav'));
+          }
+        ?>
       </nav>
     </div>
   </div>
diff --git a/templates/header.php b/templates/header.php
index 6855e2e..b74fd87 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -2,7 +2,11 @@
   <div class="container">
     <a class="brand" href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a>
     <nav id="nav-main" role="navigation">
-      <?php wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav nav-pills')); ?>
+      <?php
+        if (has_nav_menu('primary_navigation')) {
+          wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav nav-pills'));
+        }
+      ?>
     </nav>
   </div>
 </header>
\ No newline at end of file