diff --git a/padrino-core/lib/padrino-core/server.rb b/padrino-core/lib/padrino-core/server.rb
index bf27d7a76..74a7bac43 100644
--- a/padrino-core/lib/padrino-core/server.rb
+++ b/padrino-core/lib/padrino-core/server.rb
@@ -77,11 +77,9 @@ def start
     #
     def self.detect_rack_handler
       Handlers.each do |handler|
-        
-          return handler if Rack::Handler.get(handler.to_s.downcase)
-        rescue LoadError
-        rescue NameError
-        
+        return handler if Rackup::Handler.get(handler.to_s.downcase)
+      rescue LoadError, NameError
+        # Ignored
       end
       fail "Server handler (#{Handlers.join(', ')}) not found."
     end