diff --git a/Assets/Scripts/VotingPage.cs b/Assets/Scripts/VotingPage.cs
index 78b762d..6ec4eea 100644
--- a/Assets/Scripts/VotingPage.cs
+++ b/Assets/Scripts/VotingPage.cs
@@ -38,7 +38,11 @@ private void Update()
             return;
 
 
-        if (endOfTimer <= DateTime.Now)
+        if (DateTime.Now < endOfTimer)
+        {
+            timerLabel.text = (DateTime.Now - endOfTimer).TotalSeconds.ToString("D2");
+        }
+        else
         {
             timerLabel.text = "0";
             if (remainingQuestions.Count > 0)
@@ -51,10 +55,6 @@ private void Update()
                 OnVoteEnded?.Invoke();
             }
         }
-        else
-        {
-            timerLabel.text = (DateTime.Now - endOfTimer).ToString("D2");
-        }
     }
 
 
@@ -130,19 +130,24 @@ private void OnQuestionChanged(object sender, ValueChangedEventArgs _questionRef
 
     private void UpdateVoters()
     {
-        List<Player> playersThatHasVotedForFirstProposition = new List<Player>();
-        foreach (string playerId in currentQuestion.propositions[0].voters)
+        if (currentQuestion.propositions[0] != null)
         {
-            playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]);
+            List<Player> playersThatHasVotedForFirstProposition = new List<Player>();
+            foreach (string playerId in currentQuestion.propositions[0].voters)
+            {
+                playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]);
+            }
+            proposition1.UpdateVoters(playersThatHasVotedForFirstProposition);
         }
 
-        List<Player> playersThatHasVotedForSecondProposition = new List<Player>();
-        foreach (string playerId in currentQuestion.propositions[1].voters)
+        if (currentQuestion.propositions[1] != null)
         {
-            playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]);
+            List<Player> playersThatHasVotedForSecondProposition = new List<Player>();
+            foreach (string playerId in currentQuestion.propositions[1].voters)
+            {
+                playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]);
+            }
+            proposition2.UpdateVoters(playersThatHasVotedForSecondProposition);
         }
-
-        proposition1.UpdateVoters(playersThatHasVotedForFirstProposition);
-        proposition2.UpdateVoters(playersThatHasVotedForSecondProposition);
     }
 }