0
@@ -39,18 +39,14 @@
0
       
0
       controller_name = (route_params[:namespace] ? route_params[:namespace] + '/' : '') + route_params[:controller]
0
       
0
-      if controller_name.nil?
0
+      unless controller_name
0
         raise Merb::ControllerExceptions::NotFound, "Route matched, but route did not specify a controller" 
0
       end
0
       
0
       Merb.logger.debug("Routed to: #{request.route_params.inspect}")
0
 
0
-      begin
0
-        cnt = controller_name.snake_case.to_const_string
0
-      rescue ::String::InvalidPathConversion
0
-        raise Merb::ControllerExceptions::NotFound, 
0
-          "Controller '#{controller_name}' could not be converted to a class"
0
-      end
0
+      cnt = controller_name.snake_case.to_const_string
0
+      
0
       if !Merb::Controller._subclasses.include?(cnt)
0
         raise Merb::ControllerExceptions::NotFound, "Controller '#{cnt}' not found"
0
       end