diff --git a/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java b/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java
index 5609653..9367e35 100644
--- a/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java
+++ b/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java
@@ -55,6 +55,8 @@ protected HandlerMethod handleNoMatch(Set<RequestMappingInfo> infos,
                         boolean hasFrameworkMatch;
                         try {
                             hasFrameworkMatch = frameworkMapping.getHandler(request) != null;
+                        } catch (ServletException e) {
+                            throw e;
                         } catch (Exception e) {
                             throw new IllegalStateException(e);
                         }