1 files changed, 8 insertions, 6 deletions
diff --git a/lib/puppet/network/http.rb b/lib/puppet/network/http.rb
index 062c67c71..c219859b6 100644
--- a/lib/puppet/network/http.rb
+++ b/lib/puppet/network/http.rb
@@ -1,13 +1,15 @@
 class Puppet::Network::HTTP
     def self.server_class_by_type(kind)
-        return Puppet::Network::HTTP::WEBrick if kind.to_sym == :webrick
-        if kind.to_sym == :mongrel
+        case kind.to_sym
+        when :webrick:
+            require 'puppet/network/http/webrick'
+            return Puppet::Network::HTTP::WEBrick
+        when :mongrel:
             raise ArgumentError, "Mongrel is not installed on this platform" unless Puppet.features.mongrel?
+            require 'puppet/network/http/mongrel'
             return Puppet::Network::HTTP::Mongrel 
+        else
+            raise ArgumentError, "Unknown HTTP server name [#{kind}]"
         end
-        raise ArgumentError, "Unknown HTTP server name [#{kind}]"
     end
 end
-
-require 'puppet/network/http/webrick'
-require 'puppet/network/http/mongrel'