Index: src/Plugins/Wti/Wti.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs
===================================================================
diff -u -r8dc9072dc347e9f8183ad0799f196985b42d9504 -rd7434ff4590f4ae05b3fc7d44739e0f92b7820cd
--- src/Plugins/Wti/Wti.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision 8dc9072dc347e9f8183ad0799f196985b42d9504)
+++ src/Plugins/Wti/Wti.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision d7434ff4590f4ae05b3fc7d44739e0f92b7820cd)
@@ -170,7 +170,7 @@
         {
             var message = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorReading_0_Cause_1_,
                                         path, e.Message);
-            log.Error(message, e);
+            log.Error(message);
             return new SurfaceLinesFileReadResult(true);
         }
 
Index: test/Plugins/Wti/Wti.IO.Test/PipingSurfaceLinesCsvReaderTest.cs
===================================================================
diff -u -recfa21abcbbd04db3963323e308dd0b94c8cb7a0 -rd7434ff4590f4ae05b3fc7d44739e0f92b7820cd
--- test/Plugins/Wti/Wti.IO.Test/PipingSurfaceLinesCsvReaderTest.cs	(.../PipingSurfaceLinesCsvReaderTest.cs)	(revision ecfa21abcbbd04db3963323e308dd0b94c8cb7a0)
+++ test/Plugins/Wti/Wti.IO.Test/PipingSurfaceLinesCsvReaderTest.cs	(.../PipingSurfaceLinesCsvReaderTest.cs)	(revision d7434ff4590f4ae05b3fc7d44739e0f92b7820cd)
@@ -77,7 +77,7 @@
         }
 
         [Test]
-        public void GetLineCount_OpenedValidFileWithHeaderAndTwoSurfaceLines_ReturnNumberOfSurfaceLines()
+        public void GetSurfaceLinesCount_OpenedValidFileWithHeaderAndTwoSurfaceLines_ReturnNumberOfSurfaceLines()
         {
             // Setup
             string path = Path.Combine(testDataPath, "TwoValidSurfaceLines.csv");
@@ -93,7 +93,7 @@
         }
 
         [Test]
-        public void GetLineCount_OpenedValidFileWithHeaderAndNoSurfaceLines_ReturnZero()
+        public void GetSurfaceLinesCount_OpenedValidFileWithHeaderAndNoSurfaceLines_ReturnZero()
         {
             // Setup
             string path = Path.Combine(testDataPath, "ValidFileWithoutSurfaceLines.csv");
@@ -109,45 +109,6 @@
         }
 
         [Test]
-        [SetCulture("nl-NL")]
-        public void ReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLinesWithCultureNL_ReturnCreatedSurfaceLine()
-        {
-            DoReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLines_ReturnCreatedSurfaceLine();
-        }
-
-        [Test]
-        [SetCulture("en-US")]
-        public void ReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLinesWithCultureEN_ReturnCreatedSurfaceLine()
-        {
-            DoReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLines_ReturnCreatedSurfaceLine();
-        }
-
-        [Test]
-        public void ReadLine_OpenedValidFileWithoutHeaderAndTwoSurfaceLinesWhileAtTheEndOfFile_ReturnNull()
-        {
-            // Setup
-            string path = Path.Combine(testDataPath, "TwoValidSurfaceLines.csv");
-
-            using (var reader = new PipingSurfaceLinesCsvReader(path))
-            {
-                int surfaceLinesCount = reader.GetSurfaceLinesCount();
-                for (int i = 0; i < surfaceLinesCount; i++)
-                {
-                    var pipingSurfaceLine = reader.ReadLine();
-                    Assert.IsNotInstanceOf<IDisposable>(pipingSurfaceLine,
-                                                        "Fail Fast: Disposal logic required to be implemented in test.");
-                    Assert.IsNotNull(pipingSurfaceLine);
-                }
-
-                // Call
-                var result = reader.ReadLine();
-
-                // Assert
-                Assert.IsNull(result);
-            }
-        }
-
-        [Test]
         public void GetSurfaceLinesCount_FileCannotBeFound_ThrowCriticalFileReadException()
         {
             // Setup
@@ -258,6 +219,45 @@
             }
         }
 
+        [Test]
+        [SetCulture("nl-NL")]
+        public void ReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLinesWithCultureNL_ReturnCreatedSurfaceLine()
+        {
+            DoReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLines_ReturnCreatedSurfaceLine();
+        }
+
+        [Test]
+        [SetCulture("en-US")]
+        public void ReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLinesWithCultureEN_ReturnCreatedSurfaceLine()
+        {
+            DoReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLines_ReturnCreatedSurfaceLine();
+        }
+
+        [Test]
+        public void ReadLine_OpenedValidFileWithoutHeaderAndTwoSurfaceLinesWhileAtTheEndOfFile_ReturnNull()
+        {
+            // Setup
+            string path = Path.Combine(testDataPath, "TwoValidSurfaceLines.csv");
+
+            using (var reader = new PipingSurfaceLinesCsvReader(path))
+            {
+                int surfaceLinesCount = reader.GetSurfaceLinesCount();
+                for (int i = 0; i < surfaceLinesCount; i++)
+                {
+                    var pipingSurfaceLine = reader.ReadLine();
+                    Assert.IsNotInstanceOf<IDisposable>(pipingSurfaceLine,
+                                                        "Fail Fast: Disposal logic required to be implemented in test.");
+                    Assert.IsNotNull(pipingSurfaceLine);
+                }
+
+                // Call
+                var result = reader.ReadLine();
+
+                // Assert
+                Assert.IsNull(result);
+            }
+        }
+
         private void DoReadLine_OpenedValidFileWithHeaderAndTwoSurfaceLines_ReturnCreatedSurfaceLine()
         {
             // Setup