Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs
===================================================================
diff -u -r1646 -r1647
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1646)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1647)
@@ -279,43 +279,43 @@
             var location0 = locations[0];                     
             var repository = new SensorRepository(location0);
             repository.Add(new[] { sensor1, sensor2, sensor3, sensor4, sensor5, sensor6, sensor7 });
-            var sensorData = location0.SensorLocation;
-            sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
-            sensorData.SourceTypePl3 = DataSourceTypeSensors.Sensor;
-            sensorData.SourceTypePl4 = DataSourceTypeSensors.Sensor;
+            var sensorLocation = location0.SensorLocation;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location0.Name = "dwp 31,5";
 
             var location1 = locations[1];
             repository = new SensorRepository(location1);
             repository.Add(new[] { sensor1, sensor8, sensor9, sensor10 });
-            sensorData = location1.SensorLocation;
-            sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
-            sensorData.SourceTypePl3 = DataSourceTypeSensors.Sensor;
-            sensorData.SourceTypePl4 = DataSourceTypeSensors.Sensor;
+            sensorLocation = location1.SensorLocation;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location1.Name = "dwp 34,0";
 
             var location2 = locations[2];
             repository = new SensorRepository(location2);
             repository.Add(new[] { sensor1, sensor11, sensor12, sensor13, sensor14, sensor15 });
-            sensorData = location2.SensorLocation;
-            sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-            sensorData.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
-            sensorData.SourceTypePl3 = DataSourceTypeSensors.Sensor;
-            sensorData.SourceTypePl4 = DataSourceTypeSensors.Sensor;
+            sensorLocation = location2.SensorLocation;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location2.Name = "dwp 37,0";            
 
             #endregion
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u -r1646 -r1647
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1646)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1647)
@@ -798,7 +798,7 @@
                         sensorData.Sensors.Add(sensor);
                     }
                 }
-                if (sensorData.GetGroupById(sd.Group.ID) == null && sd.Group.ID >= 0)
+                if (sensorData.GetGroupById(sd.Group.ID) == null && sd.Group.ID != 0)
                 {
                     sd.Group.PickSensors = sensorData.Sensors;
                     sensorData.SensorGroups.Add(sd.Group);