diff --git a/PolyChat/MainPage.xaml b/PolyChat/MainPage.xaml
index ebdfd13..e2d66c4 100644
--- a/PolyChat/MainPage.xaml
+++ b/PolyChat/MainPage.xaml
@@ -53,7 +53,7 @@
                 <ListView x:Name="listViewPartners" ItemsSource="{x:Bind Partners}" HorizontalAlignment="Stretch" Margin="0 8 0 0">
                     <ListView.ItemTemplate>
                         <DataTemplate x:DataType="models:ChatPartner">
-                            <RadioButton GroupName="chatSelect" Tag="{x:Bind Code}" HorizontalAlignment="Stretch" Height="64" Checked="OnChatPartnerSelected">
+                            <RadioButton GroupName="chatSelect" Tag="{x:Bind Code}" HorizontalAlignment="Stretch" Height="64" Click="OnChatPartnerSelected">
                                 <StackPanel x:Name="ChatPartner" VerticalAlignment="Center" HorizontalAlignment="Stretch">
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
                                         <TextBlock HorizontalAlignment="Stretch" Text="{x:Bind Name}"/>
diff --git a/PolyChat/MainPage.xaml.cs b/PolyChat/MainPage.xaml.cs
index 1eccd36..08b3b2e 100644
--- a/PolyChat/MainPage.xaml.cs
+++ b/PolyChat/MainPage.xaml.cs
@@ -124,7 +124,7 @@ namespace PolyChat
         /// <param name="message">ChatMessage</param>
         public void OnIncomingMessage(string origin, string json)
         {
-            ChatPartner sendingPartner = Partners.First(p => p.Code == origin);
+            ChatPartner sendingPartner = Partners.FirstOrDefault(p => p.Code == origin);
             sendingPartner.AddMessage(new ChatMessage(origin, json));
         }
 
@@ -140,7 +140,7 @@ namespace PolyChat
         {
             await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
-                Partners.Remove(Partners.First(p => p.Code == code));
+                Partners.Remove(Partners.FirstOrDefault(p => p.Code.Equals(code)));
                 selectedPartner = null;
                 updateNoChatsPlaceholder();
                 updateNoChatSelected();
@@ -149,7 +149,7 @@ namespace PolyChat
         public void OnChatPartnerSelected(object sender, RoutedEventArgs e)
         {
             string code = ((RadioButton)sender).Tag.ToString();
-            selectedPartner = Partners.First(p => p.Code == code);
+            selectedPartner = Partners.FirstOrDefault(p => p.Code == code);
             listViewMessages.ItemsSource = selectedPartner.Messages;
             selectedPartnerName.Text = selectedPartner.Name;
             updateNoChatSelected();