Merge pull request #647 from RobertSzkutak/rob

Fix for #620 and #224: prevent implicit conversion of nil to string

deploy/lib/server_config.rb

@@ -65,6 +65,9 @@ def initialize(options)
     @config_file = @properties["ml.config.file"]
 
     @properties["ml.server"] = @properties["ml.#{@environment}-server"] unless @properties["ml.server"]
+    if (@properties["ml.server"] == nil)
+      raise "Error! ml.server not set. You may be missing deploy/" + @properties["environment"] + ".properties"
+    end
 
     @hostname = @properties["ml.server"]
     @bootstrap_port_four = @properties["ml.bootstrap-port-four"]
@@ -128,7 +131,7 @@ def info
       logger.info "IS_JAR: #{@@is_jar}"
       logger.info "Properties:"
       @properties.sort {|x,y| x <=> y}.each do |k, v|
-        logger.info k + ": " + v
+        logger.info k + ": " + v.to_s
       end
     end
     return true