Index: DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs
===================================================================
diff -u -r1284 -r1482
--- DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 1284)
+++ DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 1482)
@@ -1408,84 +1408,168 @@
         [Browsable(false)]
         public double? DikeToeAtRiverXrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeToeAtRiverYrd", 80)]
         [Browsable(false)]
         public double? DikeToeAtRiverYrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Y; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Y;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeToeAtRiverZrd", 81)]
         [Browsable(false)]
         public double? DikeToeAtRiverZrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeTopAtRiverXrd", 82)]
         [Browsable(false)]
         public double? DikeTopAtRiverXrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeTopAtRiverYrd", 83)]
         [Browsable(false)]
         public double? DikeTopAtRiverYrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Y; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Y;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeTopAtRiverZrd", 84)]
         [Browsable(false)]
         public double? DikeTopAtRiverZrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeTopAtPolderXrd", 85)]
         [Browsable(false)]
         public double? DikeTopAtPolderXrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeTopAtPolderYrd", 86)]
         [Browsable(false)]
         public double? DikeTopAtPolderYrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Y; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Y;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeTopAtPolderZrd", 87)]
         [Browsable(false)]
         public double? DikeTopAtPolderZrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeToeAtPolderXrd", 88)]
         [Browsable(false)]
         public double? DikeToeAtPolderXrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeToeAtPolderYrd", 89)]
         [Browsable(false)]
         public double? DikeToeAtPolderYrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Y; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Y;
+                }
+                return null;
+            }
         }
 
         [CsvExportColumn("DikeToeAtPolderZrd", 90)]
         [Browsable(false)]
         public double? DikeToeAtPolderZrd
         {
-            get { return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z; }
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z;
+                }
+                return null;
+            }
         }
 
         [Browsable(false)]