diff --git a/lib/deployml/project.rb b/lib/deployml/project.rb
index <HASH>..<HASH> 100644
--- a/lib/deployml/project.rb
+++ b/lib/deployml/project.rb
@@ -159,13 +159,15 @@ module DeploYML
     end
 
     def load_server!
-      unless Servers.has_key?(@config.server_name)
-        raise(InvalidConfig,"Unknown Server #{@config.server_name} given under the :server option",caller)
-      end
+      if @config.server_name
+        unless Servers.has_key?(@config.server_name)
+          raise(InvalidConfig,"Unknown Server #{@config.server_name} given under the :server option",caller)
+        end
 
-      extend SERVERS[@config.server_name]
+        extend SERVERS[@config.server_name]
 
-      initialize_server() if self.respond_to?(:initialize_server)
+        initialize_server() if self.respond_to?(:initialize_server)
+      end
     end
 
   end
Only load the Server module if a server was defined in deploy.yml.