diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java
index 88ae3c2a9a..755712747d 100755
--- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java
+++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java
@@ -99,12 +99,14 @@ public class KeycloakServletExtension implements ServletExtension {
         InputStream is = getConfigInputStream(servletContext);
         KeycloakDeployment deployment = null;
         if (is == null) {
-            throw new RuntimeException("Unable to find realm config in /WEB-INF/keycloak.json or in keycloak subsystem.");
+            log.warn("No adapter configuration.  Keycloak is unconfigured and will deny all requests.");
+            deployment = new KeycloakDeployment();
         } else {
             deployment = KeycloakDeploymentBuilder.build(is);
 
         }
         AdapterDeploymentContext deploymentContext = new AdapterDeploymentContext(deployment);
+        servletContext.setAttribute(AdapterDeploymentContext.class.getName(), deploymentContext);
         UndertowUserSessionManagement userSessionManagement = new UndertowUserSessionManagement();
         final ServletKeycloakAuthMech mech = createAuthenticationMechanism(deploymentInfo, deploymentContext, userSessionManagement);
 
diff --git a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 8c92fe914f..0925383be5 100755
--- a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -2,10 +2,19 @@
     <deployment>
         <dependencies>
             <module name="org.apache.httpcomponents"/>
+            <module name="org.bouncycastle"/>
+            <module name="org.jboss.resteasy.resteasy-jackson-provider" services="import"/>
             <module name="org.codehaus.jackson.jackson-core-asl"/>
             <module name="org.codehaus.jackson.jackson-mapper-asl"/>
         </dependencies>
         <exclusions>
+            <module name="org.jboss.resteasy.resteasy-jackson2-provider"/>
+
+            <!-- Exclude keycloak modules -->
+            <module name="org.keycloak.keycloak-core" />
+            <module name="org.keycloak.keycloak-adapter-core" />
+            <module name="org.keycloak.keycloak-undertow-adapter" />
+            <module name="org.keycloak.keycloak-as7-adapter" />
         </exclusions>
     </deployment>
 </jboss-deployment-structure>
\ No newline at end of file