diff --git a/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java b/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java
index 030da0cb1..c920ec8c2 100644
--- a/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java
+++ b/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java
@@ -70,7 +70,7 @@ public class RequestContext implements AlterableContext {
                     try {
                         instance.destroy();
                     } catch (Exception e) {
-                        throw new IllegalStateException("Unable to destroy instance" + instance.get());
+                        throw new IllegalStateException("Unable to destroy instance" + instance.get(), e);
                     }
                 }
             }
diff --git a/undertow/runtime/src/main/java/org/jboss/shamrock/undertow/runtime/UndertowDeploymentTemplate.java b/undertow/runtime/src/main/java/org/jboss/shamrock/undertow/runtime/UndertowDeploymentTemplate.java
index d736bf92a..5e408d913 100644
--- a/undertow/runtime/src/main/java/org/jboss/shamrock/undertow/runtime/UndertowDeploymentTemplate.java
+++ b/undertow/runtime/src/main/java/org/jboss/shamrock/undertow/runtime/UndertowDeploymentTemplate.java
@@ -16,6 +16,7 @@ import org.jboss.shamrock.runtime.StartupContext;
 import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
+import io.undertow.server.handlers.CanonicalPathHandler;
 import io.undertow.server.handlers.resource.ClassPathResourceManager;
 import io.undertow.servlet.Servlets;
 import io.undertow.servlet.api.DeploymentInfo;
@@ -122,7 +123,7 @@ public class UndertowDeploymentTemplate {
         if (undertow == null) {
             undertow = Undertow.builder()
                     .addHttpListener(Integer.parseInt(port), "localhost")
-                    .setHandler(ROOT_HANDLER)
+                    .setHandler(new CanonicalPathHandler(ROOT_HANDLER))
                     .build();
             undertow.start();
         }