diff --git a/gametest_rev1.py b/gametest_rev1.py
index 5303d26..6532a83 100644
--- a/gametest_rev1.py
+++ b/gametest_rev1.py
@@ -311,7 +311,7 @@ def enter_name():
                                 if event.type == KEYDOWN:
                                         if event.key == pygame.K_BACKSPACE:
                                             name = name[:-1]
-                                        elif event.key == pygame.K_RETURN:
+                                        elif event.key == pygame.K_RETURN and len(name) > 0:
                                             clear_screen()
                                             return name
                                         else:
@@ -421,7 +421,7 @@ while True:
         handle_events()
         show_debug()
 
-        if game_running == False: 
+        if game_running == False and game_ending == False: 
 
             if game_just_started == True:
                 print("New game starting")