Index: DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporter.cs
===================================================================
diff -u -r5352 -r5387
--- DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporter.cs	(.../GeometryExporter.cs)	(revision 5352)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporter.cs	(.../GeometryExporter.cs)	(revision 5387)
@@ -31,36 +31,25 @@
 public static class GeometryExporter
 {
     /// <summary>
-    /// Export the geometry to a json file
+    /// Next constants are used for debugging purposes
     /// </summary>
-    /// <param name="geometry"></param>
-    /// <param name="fileName"></param>
-    public static void ExportToJsonFile(GeometryData geometry, string fileName)
-    {
-        var jsonSerializerOptions = new JsonSerializerOptions
-        {
-            WriteIndented = true
-        };
-        PersistableGeometry persistableGeometry = GeometryExporterHelper.CreateFromGeometryData(geometry);
-        string output = JsonSerializer.Serialize(persistableGeometry, jsonSerializerOptions);
-        // Save output to text file
-        File.WriteAllText(fileName, output);
-    }
-
+    public const string VisualizationFolder = @"C:\Dam\DamTools\GeometryVisualizer\"; //#John, for debugging purposes
+    //public const string GeometryExporter.VisualizationFolder = @"D:\src\dam\DamTools\GeometryVisualizer\"; //#Tom
+    public const string ExportJasonFile = "GeometryWithSurf.json"; //for debugging purposes
+    
     /// <summary>
     /// Export the geometry to a json file
     /// </summary>
+    /// <param name="fileName"></param>
     /// <param name="geometry"></param>
     /// <param name="surfaceLine"></param>
-    /// <param name="fileName"></param>
-    public static void ExportWithSurfaceLineToJsonFile(GeometryData geometry, GeometryPointString surfaceLine, string fileName)
+    public static void ExportWithSurfaceLineToJsonFile(string fileName, GeometryData geometry, GeometryPointString surfaceLine = null)
     {
         var jsonSerializerOptions = new JsonSerializerOptions
         {
             WriteIndented = true
         };
         PersistableGeometry persistableGeometry = GeometryExporterHelper.CreateFromGeometryData(geometry);
-        //string output = JsonSerializer.Serialize(persistableGeometry, jsonSerializerOptions);
         PersistableSurfaceLine persistableSurfaceLine = GeometryExporterHelper.CreateFromGeometryPointString(surfaceLine);
         PersistableGeometryWithSurfaceLine persistableGeometryWithSurfaceLine = new PersistableGeometryWithSurfaceLine
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporterHelper.cs
===================================================================
diff -u -r5352 -r5387
--- DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporterHelper.cs	(.../GeometryExporterHelper.cs)	(revision 5352)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporterHelper.cs	(.../GeometryExporterHelper.cs)	(revision 5387)
@@ -73,6 +73,10 @@
     /// <returns></returns>
     public static PersistableSurfaceLine CreateFromGeometryPointString(GeometryPointString surfaceLine)
     {
+        if (surfaceLine == null)
+        {
+            return null;
+        }
         return new PersistableSurfaceLine
         {
             Points = surfaceLine.CalcPoints.Select(point => new PersistablePoint()