diff --git a/app/views/home/_conference_details.html.haml b/app/views/home/_conference_details.html.haml
index 36f4ad09..ec1683d1 100644
--- a/app/views/home/_conference_details.html.haml
+++ b/app/views/home/_conference_details.html.haml
@@ -20,7 +20,7 @@
             = simple_format(conference.venue.description, class: 'lead')
         .col-md-2
           .btn-group-vertical
-            - if controller.class.name != "ConferenceController"
+            - if @conference && controller.class.name != "ConferenceController"
               = link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
             - if conference.registration_open?
               - if conference.user_registered?(current_user)
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 25a32a24..1f8a92e0 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -7,12 +7,12 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      - if controller.class.name == "ConferenceController"
+      - if @conference && controller.class.name == "ConferenceController"
         = link_to @conference.title, "#", :class => 'navbar-brand'
       - else
         = link_to CONFIG['name'], root_path, :class => 'navbar-brand', :title => "Open Source Event Manager"
     .collapse.navbar-collapse
-      - if @conference && controller.class.name == "ConferenceController"
+      - if content_for?(:splash_header)
         = yield(:splash_header)
       - else
         - if @conference && !@conference.short_title.nil?