diff --git a/ApplicationView/ApplicationController.cs b/ApplicationView/ApplicationController.cs
index bbbdc4024..f6b4c9a65 100644
--- a/ApplicationView/ApplicationController.cs
+++ b/ApplicationView/ApplicationController.cs
@@ -241,6 +241,10 @@ namespace MatterHackers.MatterControl
 						thumbGenResetEvent.WaitOne();
 					}
 				}
+				catch (AppDomainUnloadedException)
+				{
+					return;
+				}
 				catch (ThreadAbortException)
 				{
 					return;
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index be5a14436..b91a4c8f8 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit be5a14436e63982ec3eaee7d0fee215fbf0e1747
+Subproject commit b91a4c8f8e0855fe3b647d31d5cf6cf251e92a91
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 2c59b3542..d1b8cee0f 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -436,7 +436,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 		/// </summary>
 		/// <param name="testRunner">The TestRunner to interact with</param>
 		/// <param name="textValue">The text to type</param>
-		public static void CompleteDialog(this AutomationRunner testRunner, string textValue, double secondsToWait = 1)
+		public static void CompleteDialog(this AutomationRunner testRunner, string textValue, double secondsToWait = 2)
 		{
 			// AutomationDialog requires no delay
 			if (AggContext.FileDialogs is AutomationDialogProvider)