diff --git a/ConsoleApp1/Program.cs b/ConsoleApp1/Program.cs
index d6bc593..fdd9bd6 100644
--- a/ConsoleApp1/Program.cs
+++ b/ConsoleApp1/Program.cs
@@ -12,6 +12,12 @@ var logger = new LogBuilder("MyApp")
     .BoostWithProcessId()
     .Build();
 
+while (true)
+{
+    logger.Information("Application started - iteration ");
+    logger.Error(new Exception("Nerd!"), "Something went wrong - iteration");
+}
+
 Console.WriteLine("Logger created successfully");
 Console.WriteLine("Writing log entries...");
 
diff --git a/EonaCat.LogStack/EonaCat.LogStack.csproj b/EonaCat.LogStack/EonaCat.LogStack.csproj
index c2b34c2..7ccef21 100644
--- a/EonaCat.LogStack/EonaCat.LogStack.csproj
+++ b/EonaCat.LogStack/EonaCat.LogStack.csproj
@@ -14,7 +14,7 @@ It features a rich fluent API for routing log events to dozens of destinations f
     <Copyright>EonaCat (Jeroen Saey)</Copyright>
     <PackageTags>EonaCat;Logger;EonaCatLogStack;Log;Writer;Flows;LogStack;Memory;Speed;Jeroen;Saey</PackageTags>
     <PackageIconUrl />
-    <FileVersion>0.1.8</FileVersion>
+    <FileVersion>0.1.9</FileVersion>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -25,7 +25,7 @@ It features a rich fluent API for routing log events to dozens of destinations f
   </PropertyGroup>
 
 	<PropertyGroup>
-		<EVRevisionFormat>0.1.8+{chash:10}.{c:ymd}</EVRevisionFormat>
+		<EVRevisionFormat>0.1.9+{chash:10}.{c:ymd}</EVRevisionFormat>
 		<EVDefault>true</EVDefault>
 		<EVInfo>true</EVInfo>
 		<EVTagMatch>v[0-9]*</EVTagMatch>
@@ -36,7 +36,7 @@ It features a rich fluent API for routing log events to dozens of destinations f
 	</PropertyGroup>
 
     <PropertyGroup>
-      <Version>0.1.8</Version>
+      <Version>0.1.9</Version>
       <PackageId>EonaCat.LogStack</PackageId>
       <Product>EonaCat.LogStack</Product>
       <RepositoryUrl>https://git.saey.me/EonaCat/EonaCat.LogStack</RepositoryUrl>
diff --git a/EonaCat.LogStack/EonaCatLoggerCore/Flows/EncryptedFileFlow.cs b/EonaCat.LogStack/EonaCatLoggerCore/Flows/EncryptedFileFlow.cs
index c6468b2..dc09ad7 100644
--- a/EonaCat.LogStack/EonaCatLoggerCore/Flows/EncryptedFileFlow.cs
+++ b/EonaCat.LogStack/EonaCatLoggerCore/Flows/EncryptedFileFlow.cs
@@ -181,8 +181,6 @@ namespace EonaCat.LogStack.Flows
                 throw new ArgumentNullException("template");
             }
 
-            CheckForProcessTermination();
-
             _directory = directory;
             _password = password;
             _filePrefix = filePrefix;
@@ -263,33 +261,6 @@ namespace EonaCat.LogStack.Flows
             _retentionThread.Start();
         }
 
-        private void CheckForProcessTermination()
-        {
-            AppDomain.CurrentDomain.ProcessExit += (_, __) =>
-            {
-                try
-                {
-                    DisposeAsync().AsTask().GetAwaiter().GetResult();
-                }
-                catch
-                {
-                    // Do nothing
-                }
-            };
-
-            Console.CancelKeyPress += (_, e) =>
-            {
-                try
-                {
-                    DisposeAsync().AsTask().GetAwaiter().GetResult();
-                }
-                catch
-                {
-                    // Do nothing
-                }
-            };
-        }
-
         /// <summary>Add an ambient property enricher applied to every event.</summary>
         public EncryptedFileFlow EnrichWith(string key, Func<LogEvent, object> valueFactory)
         {
diff --git a/EonaCat.LogStack/EonaCatLoggerCore/Flows/FileFlow.cs b/EonaCat.LogStack/EonaCatLoggerCore/Flows/FileFlow.cs
index 23b1cda..19fa2c9 100644
--- a/EonaCat.LogStack/EonaCatLoggerCore/Flows/FileFlow.cs
+++ b/EonaCat.LogStack/EonaCatLoggerCore/Flows/FileFlow.cs
@@ -185,8 +185,6 @@ namespace EonaCat.LogStack.Flows
                 throw new ArgumentNullException("template");
             }
 
-            CheckForProcessTermination();
-
             _batchSize = batchSize <= 0 ? 1 : batchSize;
             _directory = directory;
             _filePrefix = filePrefix;
@@ -247,33 +245,6 @@ namespace EonaCat.LogStack.Flows
             _retentionTask = Task.Factory.StartNew(RetentionLoop, TaskCreationOptions.LongRunning);
         }
 
-        private void CheckForProcessTermination()
-        {
-            AppDomain.CurrentDomain.ProcessExit += (_, __) =>
-            {
-                try
-                {
-                    DisposeAsync().AsTask().GetAwaiter().GetResult();
-                }
-                catch 
-                {
-                    // Do nothing
-                }
-            };
-
-            Console.CancelKeyPress += (_, e) =>
-            {
-                try
-                {
-                    DisposeAsync().AsTask().GetAwaiter().GetResult();
-                }
-                catch
-                {
-                    // Do nothing
-                }
-            };
-        }
-
         /// <summary>Add an ambient property enricher applied to every event.</summary>
         public FileFlow EnrichWith(string key, Func<LogEvent, object> valueFactory)
         {