diff --git a/modules/reitit-core/src/reitit/interceptor.cljc b/modules/reitit-core/src/reitit/interceptor.cljc
index 7ef698df..5b3de7d7 100644
--- a/modules/reitit-core/src/reitit/interceptor.cljc
+++ b/modules/reitit-core/src/reitit/interceptor.cljc
@@ -34,9 +34,10 @@
   #?(:clj  clojure.lang.Keyword
      :cljs cljs.core.Keyword)
   (into-interceptor [this data {:keys [::registry] :as opts}]
-    (or (if-let [interceptor (if registry (registry this))]
-          (into-interceptor interceptor data opts))
-        (exception/fail!
+    (if-let [interceptor (if registry (registry this))]
+      (into-interceptor interceptor data opts)
+      (throw
+        (ex-info
           (str
             "Interceptor " this " not found in registry.\n\n"
             (if (seq registry)
@@ -44,9 +45,9 @@
                 "Available interceptors in registry:\n"
                 (with-out-str
                   (pprint/print-table [:id :description] (for [[k v] registry] {:id k :description v}))))
-              "See [reitit.interceptor/router] on how to add interceptor to the registry.\n") "\n")
+              "see [reitit.interceptor/router] on how to add interceptor to the registry.\n") "\n")
           {:id this
-           :registry registry})))
+           :registry registry}))))
 
   #?(:clj  clojure.lang.APersistentVector
      :cljs cljs.core.PersistentVector)
diff --git a/modules/reitit-core/src/reitit/middleware.cljc b/modules/reitit-core/src/reitit/middleware.cljc
index 44cf1a17..51d206be 100644
--- a/modules/reitit-core/src/reitit/middleware.cljc
+++ b/modules/reitit-core/src/reitit/middleware.cljc
@@ -18,9 +18,10 @@
   #?(:clj  clojure.lang.Keyword
      :cljs cljs.core.Keyword)
   (into-middleware [this data {:keys [::registry] :as opts}]
-    (or (if-let [middleware (if registry (registry this))]
-          (into-middleware middleware data opts))
-        (exception/fail!
+    (if-let [middleware (if registry (registry this))]
+      (into-middleware middleware data opts)
+      (throw
+        (ex-info
           (str
             "Middleware " this " not found in registry.\n\n"
             (if (seq registry)
@@ -28,9 +29,9 @@
                 "Available middleware in registry:\n"
                 (with-out-str
                   (pprint/print-table [:id :description] (for [[k v] registry] {:id k :description v}))))
-              "See [reitit.middleware/router] on how to add middleware to the registry.\n") "\n")
+              "see [reitit.middleware/router] on how to add middleware to the registry.\n") "\n")
           {:id this
-           :registry registry})))
+           :registry registry}))))
 
   #?(:clj  clojure.lang.APersistentVector
      :cljs cljs.core.PersistentVector)