diff --git a/MafiaClient/MainWindow.axaml.cs b/MafiaClient/MainWindow.axaml.cs
index e220479..ebc4c89 100644
--- a/MafiaClient/MainWindow.axaml.cs
+++ b/MafiaClient/MainWindow.axaml.cs
@@ -265,21 +265,26 @@ namespace MafiaClient
 
         private void GameDaySelect_OnMouseDoubleClick(object sender, RoutedEventArgs e)
         {
-            ListBoxItem selected = (ListBoxItem)(this.FindControl<ListBox>("GameDaySelect").SelectedItem);
-            App.Instance.Connection.Vote(Convert.ToInt32(((string)selected.Content).Split(")")[0]));
+            if (this.FindControl<ListBox>("GameDaySelect").SelectedItem != null)
+            {
+                ListBoxItem selected = (ListBoxItem) (this.FindControl<ListBox>("GameDaySelect").SelectedItem);
+                App.Instance.Connection.Vote(Convert.ToInt32(((string) selected.Content).Split(")")[0]));
+            }
         }
 
         public void ShowDay(bool voting, Role role, List<Player> players)
         {
             this.FindControl<ListBox>("GameDaySelect").IsEnabled = voting;
-            List<ListBoxItem> items = new List<ListBoxItem>();
-            foreach (Player player in players)
+            if (players.Count != 0)
             {
-                items.Add(new ListBoxItem {Content = player.Id.ToString() + ") " + player.Name});
+                List<ListBoxItem> items = new List<ListBoxItem>();
+                foreach (Player player in players)
+                {
+                    items.Add(new ListBoxItem {Content = player.Id + ") " + player.Name});
+                }
+                this.FindControl<ListBox>("GameDaySelect").Items = items;
             }
 
-            this.FindControl<ListBox>("GameDaySelect").Items = items;
-            
             if (role == Role.Died)
             {
                 this.Find<TextBlock>("GameDayHotBar").Text = "Коли умер, жди";
diff --git a/MafiaServer/Game.cs b/MafiaServer/Game.cs
index 2dd62e2..12d03b6 100644
--- a/MafiaServer/Game.cs
+++ b/MafiaServer/Game.cs
@@ -223,9 +223,11 @@ namespace MafiaServer
                 _votesRemain.Add(player);
             }
 
+            List<Player> players = GetPlayersRoles();
+
             foreach (var player in _players)
             {
-                player.SendPacket(new GameStageChangedPacket(GameState.VotingDay, player.Role, GetPlayersRoles()));
+                player.SendPacket(new GameStageChangedPacket(GameState.VotingDay, player.Role, players));
                 player.SendPacket(new MessageReceivePacket(ChatType.Day, true, "System", "Начинаем голосование!"));
             }
         }