1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 35385a5d9b..af6f0de556 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -33,7 +33,11 @@ module ActionDispatch
           end
           dispatch(controller, params[:action], req)
         rescue NameError => e
-          raise ActionController::RoutingError, e.message, e.backtrace if @raise_on_name_error
+          if @raise_on_name_error
+            raise ActionController::RoutingError, e.message, e.backtrace
+          else
+            return [404, {'X-Cascade' => 'pass'}, []]
+          end
         end
 
       protected