diff --git a/app/services/match_service.rb b/app/services/match_service.rb
index 90c5290..adf2995 100644
--- a/app/services/match_service.rb
+++ b/app/services/match_service.rb
@@ -8,7 +8,7 @@ class MatchService
   def self.generate_matches(teams)
     if teams.empty?
       # should be prevented by controller
-      return
+      raise 'Cannot generate Matches without teams'
     end
 
     if teams.size == 1
diff --git a/spec/services/match_service_spec.rb b/spec/services/match_service_spec.rb
index c4abdb9..21ada52 100644
--- a/spec/services/match_service_spec.rb
+++ b/spec/services/match_service_spec.rb
@@ -114,8 +114,8 @@ RSpec.describe MatchService do
       end
     end
 
-    it 'generates no matches for 0 teams' do
-      expect(MatchService.generate_matches([])). to eq(nil)
+    it 'raises an exception for for 0 teams' do
+      expect { MatchService.generate_matches([]) }. to raise_error 'Cannot generate Matches without teams'
     end
   end
 end