Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs
===================================================================
diff -u -r2701 -r2702
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 2701)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 2702)
@@ -83,8 +83,6 @@
             SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
         }
 
-        private Group sensorGroup;
-
         /// <summary>
         /// Gets or sets the DAM location.
         /// </summary>
@@ -133,10 +131,10 @@
         {
             get
             {
-                if (sensorGroup == null)
+                if (Group == null)
                     return -1;
 
-                return sensorGroup.ID;
+                return Group.ID;
             }
         }
 
@@ -146,7 +144,7 @@
         /// <param name="id">The identifier.</param>
         public void ResetGroupID(int id)
         {
-            sensorGroup.ID = id;
+            Group.ID = id;
         }
 
         /// <summary>
@@ -158,10 +156,10 @@
         {
             get
             {
-                if (sensorGroup == null)
+                if (Group == null)
                     return new Sensor[0];
 
-                return sensorGroup.Selection;
+                return Group.Selection;
             }
         }
 
@@ -255,7 +253,7 @@
         {
             get
             {
-                return sensorGroup == null ? 0 : Group.SensorCount;
+                return Group?.SensorCount ?? 0;
             }
         }