diff --git a/lib/msf/core/model/activerecord_patches.rb b/lib/msf/core/model/activerecord_patches.rb
index d3ab069c8b..0e591156c5 100644
--- a/lib/msf/core/model/activerecord_patches.rb
+++ b/lib/msf/core/model/activerecord_patches.rb
@@ -9,7 +9,7 @@ class ActiveRecord::Base
 		begin
 			Marshal.load(string.unpack("m")[0])
 		rescue ::Exception => e
-			YAML.load(string)
+			YAML.load(string) rescue string
 		end
 	end
 end
diff --git a/lib/msf/core/model/service.rb b/lib/msf/core/model/service.rb
index 733da0fb18..2343b9a31d 100644
--- a/lib/msf/core/model/service.rb
+++ b/lib/msf/core/model/service.rb
@@ -6,7 +6,10 @@ class Service < ActiveRecord::Base
 	has_many :vulns, :dependent => :destroy
 	has_many :notes, :dependent => :destroy
 	belongs_to :host
+
+	serialize :info
 end
 
 end
 end
+