diff --git a/GameState.py b/GameState.py
index f82e4a0..dc83235 100644
--- a/GameState.py
+++ b/GameState.py
@@ -15,7 +15,6 @@ class GameState:
         self.specialDisplay = specialDisplay
         self.specialDisplay.printCredits(self.credits)
         self.isPlaying = False
-        PLAYER_LAMPS.activateNext()
 
     def nextPlayer(self):
         self.currentPlayer = next(self.players)
diff --git a/lamps/LampGroup.py b/lamps/LampGroup.py
index 3cb01ca..4bbbef6 100644
--- a/lamps/LampGroup.py
+++ b/lamps/LampGroup.py
@@ -36,7 +36,8 @@ class LampGroup:
         self.currentLampPtr -= 1
 
     def cycle(self):
-        self.currentLamp.deactivate()
+        if self.currentLamp:
+            self.currentLamp.deactivate()
         self.currentLamp = next(self.lamp_cycle)
         self.currentLamp.activate()