diff --git a/rails/map-mash/app/views/mash_tournaments/show.html.erb b/rails/map-mash/app/views/mash_tournaments/show.html.erb
index 55ba2d7..aaa5394 100644
--- a/rails/map-mash/app/views/mash_tournaments/show.html.erb
+++ b/rails/map-mash/app/views/mash_tournaments/show.html.erb
@@ -1,6 +1,8 @@
 <ul>
 <% @mash_tournament.mashes.each do |mash| %>
-  <li><%= mash.map_a.name %> vs. <%= mash.map_b.name %>, winner = <%= mash.winner.name %></li>
+  <% if mash.map_a.present? && mash.map_b.present? && mash.winner.present? %>
+    <li><%= mash.map_a.name %> vs. <%= mash.map_b.name %>, winner = <%= mash.winner.name %></li>
+  <% end %>
 <% end %>
 </ul>