diff --git a/MainForm.cs b/MainForm.cs
index 3c8b3fb..3deeeeb 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -118,8 +118,11 @@ namespace robospot_camera_finder
 
         private void lbMain_MouseDoubleClick(object sender, MouseEventArgs e)
         {
-            Form viewer = new StreamViewer(lbMain.GetItemText(lbMain.SelectedItem), lbMain.SelectedValue.ToString());
-            viewer.Show();
+            if (lbMain.SelectedItem != null)
+            {
+                Form viewer = new StreamViewer(lbMain.GetItemText(lbMain.SelectedItem), lbMain.SelectedValue.ToString());
+                viewer.Show();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/robospot-camera-finder.csproj b/robospot-camera-finder.csproj
index 7575a91..373a798 100644
--- a/robospot-camera-finder.csproj
+++ b/robospot-camera-finder.csproj
@@ -7,8 +7,14 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
+    <StartupObject>robospot_camera_finder.Program</StartupObject>
+    <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="favicon.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Haukcode.sACN" Version="2.0.19" />
     <PackageReference Include="LibVLCSharp" Version="3.8.2" />