diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 934add7..7e817fb 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -16,6 +16,7 @@ class MatchesController < ApplicationController
     end
     if @match
       @wrestlers = @match.weight.wrestlers
+      @tournament = @match.tournament
     end
     session[:return_path] = "/tournaments/#{@match.tournament.id}/matches"
   end
@@ -24,10 +25,36 @@ class MatchesController < ApplicationController
     if params[:match]
       @match = Match.where(:id => params[:match]).includes(:wrestlers).first
     end
+    @wrestlers = []
     if @match
-      @w1 = @match.wrestler1
-      @w2 = @match.wrestler2
-      @wrestlers = [@w1,@w2]
+      if @match.w1
+        @wrestler1_name = @match.wrestler1.name
+        @wrestler1_school_name = @match.wrestler1.school.name
+        if @match.wrestler1.last_match
+          @wrestler1_last_match = time_ago_in_words(@match.wrestler1.last_match.updated_at)
+        else
+          @wrestler1_last_match = "N/A"
+        end
+        @wrestlers.push(@match.wrestler1)
+      else
+        @wrestler1_name = "Not assigned"
+        @wrestler1_school_name = "N/A"
+        @wrestler1_last_match = "N/A"
+      end
+      if @match.w2
+        @wrestler2_name = @match.wrestler2.name
+        @wrestler2_school_name = @match.wrestler2.school.name
+        if @match.wrestler2.last_match
+          @wrestler2_last_match = time_ago_in_words(@match.wrestler2.last_match.updated_at)
+        else
+          @wrestler1_last_match = "N/A"
+        end
+        @wrestlers.push(@match.wrestler2)
+      else
+        @wrestler2_name = "Not assigned"
+        @wrestler2_school_name = "N/A"
+        @wrestler2_last_match = "N/A"
+      end
       @tournament = @match.tournament
     end
     session[:return_path] = "/tournaments/#{@tournament.id}/matches"
diff --git a/app/controllers/wrestlers_controller.rb b/app/controllers/wrestlers_controller.rb
index 9493c0f..8cdc83b 100644
--- a/app/controllers/wrestlers_controller.rb
+++ b/app/controllers/wrestlers_controller.rb
@@ -30,6 +30,7 @@ class WrestlersController < ApplicationController
 
   # GET /wrestlers/1/edit
   def edit
+    @tournament = @wrestler.tournament
     @weight = @wrestler.weight
     @weights = @school.tournament.weights.sort_by{|w| w.max}
     @school = @wrestler.school
diff --git a/app/models/match.rb b/app/models/match.rb
index 0a3a98a..b5f5d2c 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -28,6 +28,9 @@ class Match < ActiveRecord::Base
 	
 	def score_validation
 		if finished == 1
+			if ! winner_id
+				errors.add(:winner_id, "cannot be blank")
+			end
 		    if win_type == "Pin" and ! score.match(/^[0-5]?[0-9]:[0-5][0-9]/)
 		    	errors.add(:score, "needs to be in time format MM:SS when win type is Pin example: 1:23 or 10:03")
 		    end
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index e7a94d1..f51a643 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -2,12 +2,12 @@
 <%= form_for(@match) do |f| %>
 <div class="field">
     <%= f.label "Wrestler 1" %><br>
-    <%= f.collection_select :w1, @wrestlers, :id, :name %>
+    <%= f.collection_select :w1, @wrestlers, :id, :name, include_blank: true %>
 </div>
 <div>vs</div>
 <div class="field">
     <%= f.label "Wrestler 2" %><br>
-    <%= f.collection_select :w2, @wrestlers, :id, :name %>
+    <%= f.collection_select :w2, @wrestlers, :id, :name, include_blank: true %>
 </div>
 <div class="actions">
     <%= f.submit onclick: "return confirm('Is the name of the winner ' + document.getElementById('match_winner_id').options[document.getElementById('match_winner_id').selectedIndex].text + '?')", :class=>"btn btn-success" %>
diff --git a/app/views/matches/_matchstats.html.erb b/app/views/matches/_matchstats.html.erb
index 30d947b..d2568b7 100644
--- a/app/views/matches/_matchstats.html.erb
+++ b/app/views/matches/_matchstats.html.erb
@@ -15,34 +15,34 @@
 <table class="table">
   <thead>
       <tr>
-        <th>Name: <%= @w1.name %> <select id="w1-color" onchange="changeW1Color(this)">
+        <th>Name: <%= @wrestler1_name %> <select id="w1-color" onchange="changeW1Color(this)">
             <option value="green">Green</option>
             <option value="red">Red</option>
         </select>
-        <br>School: <%= @w1.school.name %>
-        <br>Last Match: <%= if @w1.last_match != nil then time_ago_in_words(@w1.last_match.updated_at) else "N/A" end%></th>
-        <th>Name: <%= @w2.name %> <select id="w2-color" onchange="changeW2Color(this)">
+        <br>School: <%= @wrestler1_school_name %>
+        <br>Last Match: <%= @wrestler1_last_match %></th>
+        <th>Name: <%= @wrestler2_name %> <select id="w2-color" onchange="changeW2Color(this)">
             <option value="red">Red</option>
             <option value="green">Green</option>
         </select>
-        <br>School: <%= @w2.school.name %>
-        <br>Last Match: <%= if @w2.last_match != nil then time_ago_in_words(@w2.last_match.updated_at) else "N/A" end%></th>
+        <br>School: <%= @wrestler2_school_name %>
+        <br>Last Match: <%= @wrestler2_last_match %></th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td><%= @w1.name %> Stats: <br><%= f.text_area :w1_stat, cols: "30", rows: "10"  %></td>
-        <td><%= @w2.name %> Stats: <br><%= f.text_area :w2_stat, cols: "30", rows: "10"  %></td>
+        <td><%= @wrestler1_name %> Stats: <br><%= f.text_area :w1_stat, cols: "30", rows: "10"  %></td>
+        <td><%= @wrestler2_name %> Stats: <br><%= f.text_area :w2_stat, cols: "30", rows: "10"  %></td>
       </tr>
       <tr>
-        <td><%= @w1.name %> Scoring <br><button id="w1-takedown" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'T2')">T2</button>
+        <td><%= @wrestler1_name %> Scoring <br><button id="w1-takedown" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'T2')">T2</button>
         <button id="w1-escape" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'E1')">E1</button>
         <button id="w1-reversal" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'R2')">R2</button>
         <button id="w1-nf2" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'N2')">N2 </button>
         <button id="w1-nf3" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'N3')">N3</button>
         <button id="w1-nf4" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'N4')">N4</button>
         <button id="w1-penalty" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'P1')">P1</button></td>
-        <td><%= @w2.name %> Scoring <br><button id="w2-takedown" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'T2')">T2</button>
+        <td><%= @wrestler2_name %> Scoring <br><button id="w2-takedown" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'T2')">T2</button>
         <button id="w2-escape" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'E1')">E1</button>
         <button id="w2-reversal" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'R2')">R2</button>
         <button id="w2-nf2" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'N2')">N2</button>
@@ -51,19 +51,19 @@
         <button id="w2-penalty" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'P1')">P1</button></td>
       </tr>
       <tr>
-        <td><%= @w1.name %> Choice <br><button id="w1-top" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'|Chose Top|')">Chose Top</button>
+        <td><%= @wrestler1_name %> Choice <br><button id="w1-top" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'|Chose Top|')">Chose Top</button>
         <button id="w1-bottom" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'|Chose Bottom|')">Chose Bottom</button>
         <button id="w1-nuetral" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'|Chose Nuetral|')">Chose Nuetral</button>
         <button id="w1-defer" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'|Deferred|')">Deferred</button></td>
-        <td><%= @w2.name %> Choice <br><button id="w2-top" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'|Chose Top|')">Chose Top</button>
+        <td><%= @wrestler2_name %> Choice <br><button id="w2-top" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'|Chose Top|')">Chose Top</button>
         <button id="w2-bottom" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'|Chose Bottom|')">Chose Bottom</button>
         <button id="w2-nuetral" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'|Chose Nuetral|')">Chose Nuetral</button>
         <button id="w2-defer" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'|Deferred|')">Deferred</button></td>
       </tr>
       <tr>
-        <td><%= @w1.name %> Warnings <br><button id="w1-stalling" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'S')">Stalling</button>
+        <td><%= @wrestler1_name %> Warnings <br><button id="w1-stalling" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'S')">Stalling</button>
         <button id="w1-caution" type="button" class="btn btn-success btn-sm" onclick="updateStats(w1,'C')">Caution</button></td>
-        <td><%= @w2.name %> Warnings <br><button id="w2-stalling" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'S')">Stalling</button>
+        <td><%= @wrestler2_name %> Warnings <br><button id="w2-stalling" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'S')">Stalling</button>
         <button id="w2-caution" type="button" class="btn btn-danger btn-sm" onclick="updateStats(w2,'C')">Caution</button></td>
       </tr>
       <tr>
@@ -83,7 +83,7 @@
   <br>
   <div class="field">
     <%= f.label "Winner" %> Please choose the winner<br>
-    <%= f.collection_select :winner_id, @wrestlers, :id, :name %>
+    <%= f.collection_select :winner_id, @wrestlers, :id, :name, include_blank: true %>
   </div>
   <br>
   <div class="field">
diff --git a/app/views/matches/stat.html.erb b/app/views/matches/stat.html.erb
index 126efae..f1f802e 100644
--- a/app/views/matches/stat.html.erb
+++ b/app/views/matches/stat.html.erb
@@ -1,2 +1,2 @@
-<h1><%= @w1.name %> VS. <%= @w2.name %></h1>
+<h1><%= @wrestler1_name %> VS. <%= @wrestler2_name %></h1>
 <%= render 'matchstats' %>
\ No newline at end of file
diff --git a/app/views/tournaments/matches.html.erb b/app/views/tournaments/matches.html.erb
index 1766120..9bbcc3c 100644
--- a/app/views/tournaments/matches.html.erb
+++ b/app/views/tournaments/matches.html.erb
@@ -28,9 +28,7 @@
         <td><%= match.finished %></td>
         <td><%= link_to 'Show', match, :class=>"btn btn-default btn-sm" %>
             <%= link_to 'Edit Wrestlers', edit_match_path(match), :class=>"btn btn-primary btn-sm" %>
-            <% if match.w1 and match.w2 %>
             <%= link_to 'Stat Match', "/matches/#{match.id}/stat", :class=>"btn btn-primary btn-sm" %>
-            <% end %>
         </td>
       </tr>
     <% end %>