Index: src/Plugins/Wti/Wti.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs
===================================================================
diff -u -rf2284364cde43ab7969dd8f0fb038f846138ec41 -r8dc9072dc347e9f8183ad0799f196985b42d9504
--- src/Plugins/Wti/Wti.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision f2284364cde43ab7969dd8f0fb038f846138ec41)
+++ src/Plugins/Wti/Wti.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision 8dc9072dc347e9f8183ad0799f196985b42d9504)
@@ -23,6 +23,13 @@
     /// </summary>
     public class PipingSurfaceLinesCsvImporter : IFileImporter
     {
+        private readonly ILog log;
+
+        public PipingSurfaceLinesCsvImporter()
+        {
+            log = LogManager.GetLogger(GetType());
+        }
+
         public string Name
         {
             get
@@ -121,19 +128,14 @@
 
         private SurfaceLinesFileReadResult ReadPipingSurfaceLines(string path)
         {
-            var log = LogManager.GetLogger(GetType());
-
             PipingSurfaceLinesCsvReader reader;
             try
             {
                 reader = new PipingSurfaceLinesCsvReader(path);
             }
             catch (ArgumentException e)
             {
-                var message = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorReading_0_Cause_1_,
-                                            path, e.Message);
-                log.Error(message, e);
-                return new SurfaceLinesFileReadResult(true);
+                return HandleCriticalError(path, e);
             }
 
             var stepName = String.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_0_,
@@ -147,10 +149,7 @@
             }
             catch (CriticalFileReadException e)
             {
-                var message = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorReading_0_Cause_1_,
-                                            path, e.Message);
-                log.Error(message, e);
-                return new SurfaceLinesFileReadResult(true);
+                return HandleCriticalError(path, e);
             }
 
             var readSurfaceLines = new List<PipingSurfaceLine>(itemCount);
@@ -167,6 +166,14 @@
             };
         }
 
+        private SurfaceLinesFileReadResult HandleCriticalError(string path, Exception e)
+        {
+            var message = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorReading_0_Cause_1_,
+                                        path, e.Message);
+            log.Error(message, e);
+            return new SurfaceLinesFileReadResult(true);
+        }
+
         private void AddImportedDataToModel(object target, ICollection<PipingSurfaceLine> readSurfaceLines)
         {
             NotifyProgress(ApplicationResources.PipingSurfaceLinesCsvImporter_AddingImportedDataToModel, readSurfaceLines.Count, readSurfaceLines.Count);
@@ -186,7 +193,7 @@
 
         private void HandleUserCancellingImport()
         {
-            LogManager.GetLogger(GetType()).Info(ApplicationResources.PipingSurfaceLinesCsvImporter_ImportItem_ImportCancelled);
+            log.Info(ApplicationResources.PipingSurfaceLinesCsvImporter_ImportItem_ImportCancelled);
         }
 
         private class SurfaceLinesFileReadResult