diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs
index d9933f5f74..745d4d8d67 100644
--- a/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs
@@ -114,8 +114,14 @@ namespace Microsoft.AspNet.Authentication
         /// <returns>async completion</returns>
         internal async Task TeardownAsync()
         {
-            await FinishResponseOnce();
-            UnregisterAuthenticationHandler();
+            try
+            {
+                await FinishResponseOnce();
+            }
+            finally
+            {
+                UnregisterAuthenticationHandler();
+            }
         }
 
         /// <summary>