diff --git a/tournaments/models/event.py b/tournaments/models/event.py
index 84d30ae..daf7f76 100644
--- a/tournaments/models/event.py
+++ b/tournaments/models/event.py
@@ -20,5 +20,7 @@ class Event(models.Model):
     def display_name(self):
         if self.name:
             return self.name
-        else:
+        elif self.club.name:
             return self.club.name
+        else:
+            return '--'
diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 657cb40..8086697 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -36,7 +36,12 @@ class Tournament(models.Model):
     #estimated_end_date = models.DateTimeField(null=True, blank=True)
 
     def __str__(self):
-        return self.name
+        if self.name:
+            return self.name
+        elif self.event:
+            return self.event.display_name()
+        else:
+            return '--'
 
     def level(self):
         return self.get_federal_level_category_display()