diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs
index 2b2c80b0..1c66aea8 100644
--- a/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs
+++ b/src/Microsoft.AspNet.Http.Abstractions/Extensions/MapMiddleware.cs
@@ -57,10 +57,15 @@ public async Task Invoke(HttpContext context)
                 context.Request.PathBase = pathBase + _options.PathMatch;
                 context.Request.Path = remainingPath;
 
-                await _options.Branch(context);
-
-                context.Request.PathBase = pathBase;
-                context.Request.Path = path;
+                try
+                {
+                    await _options.Branch(context);
+                }
+                finally
+                {
+                    context.Request.PathBase = pathBase;
+                    context.Request.Path = path;
+                }
             }
             else
             {