diff --git a/src/Microsoft.AspNet.Hosting/Program.cs b/src/Microsoft.AspNet.Hosting/Program.cs
index 4776c412..83769136 100644
--- a/src/Microsoft.AspNet.Hosting/Program.cs
+++ b/src/Microsoft.AspNet.Hosting/Program.cs
@@ -8,6 +8,7 @@
 using Microsoft.Framework.ConfigurationModel;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
+using Microsoft.Framework.Logging;
 using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Hosting
@@ -52,6 +53,7 @@ public void Main(string[] args)
             };
 
             var engine = services.GetRequiredService<IHostingEngine>();
+            var loggerFactory = services.GetRequiredService<ILoggerFactory>();
             var appShutdownService = _serviceProvider.GetRequiredService<IApplicationShutdown>();
             var shutdownHandle = new ManualResetEvent(false);
 
@@ -59,7 +61,15 @@ public void Main(string[] args)
 
             appShutdownService.ShutdownRequested.Register(() =>
             {
-                serverShutdown.Dispose();
+                try
+                {
+                    serverShutdown.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    var logger = loggerFactory.Create<Program>();
+                    logger.WriteError("TODO: Dispose threw an exception", ex);
+                }
                 shutdownHandle.Set();
             });