diff --git a/KlassenBIB/Inspektionsobjekt.cs b/KlassenBIB/Inspektionsobjekt.cs
index 898a683..9047c94 100644
--- a/KlassenBIB/Inspektionsobjekt.cs
+++ b/KlassenBIB/Inspektionsobjekt.cs
@@ -10,7 +10,9 @@ namespace KlassenBIB
     [ContentProperty("Schadenskuerzeln")]
     public class Inspektionsobjekt
     {
-        public string StrasseName { get; set; }
+        private string strasseName = "none";
+
+        public string StrasseName  { get => strasseName; set => strasseName = value; }
         public string OrtName { get; set; }
         public string Hausnummer { get; set; }
         public string Projektnummer { get; set; }
diff --git a/SanSystem/frmStrassenList.cs b/SanSystem/frmStrassenList.cs
index 42077fb..89df3de 100644
--- a/SanSystem/frmStrassenList.cs
+++ b/SanSystem/frmStrassenList.cs
@@ -49,6 +49,7 @@ namespace SanSystem
 
         private void lst_strassen_DoubleClick(object sender, EventArgs e)
         {
+            if ((sender as ListBox).SelectedItem == null) return;
             string selectedStreetName = (sender as ListBox).SelectedItem.ToString();
             if (selectedStreetName == null) return;