diff --git a/lib/msf/core/data_store.rb b/lib/msf/core/data_store.rb
index eeecd6ea38..81a3e2ed55 100644
--- a/lib/msf/core/data_store.rb
+++ b/lib/msf/core/data_store.rb
@@ -29,10 +29,12 @@ class DataStore < Hash
 
     opt = @options[k]
     unless opt.nil?
-      unless opt.valid?(v)
-        raise OptionValidateError.new(["Value '#{v}' is not valid for option '#{k}'#{['', ', try harder'].sample}"])
+      if opt.validate_on_assignment?
+        unless opt.valid?(v)
+          raise OptionValidateError.new(["Value '#{v}' is not valid for option '#{k}'"])
+        end
+        v = opt.normalize(v)
       end
-      v = opt.normalize(v)
     end
 
     super(k,v)
diff --git a/lib/msf/core/opt_address_range.rb b/lib/msf/core/opt_address_range.rb
index 50c1653971..13dbe4bcd1 100644
--- a/lib/msf/core/opt_address_range.rb
+++ b/lib/msf/core/opt_address_range.rb
@@ -12,6 +12,10 @@ class OptAddressRange < OptBase
     return 'addressrange'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   def normalize(value)
     return nil unless value.kind_of?(String)
     if (value =~ /^file:(.*)/)
diff --git a/lib/msf/core/opt_base.rb b/lib/msf/core/opt_base.rb
index 566f53703f..b332788bc5 100644
--- a/lib/msf/core/opt_base.rb
+++ b/lib/msf/core/opt_base.rb
@@ -75,6 +75,13 @@ module Msf
       return (type == in_type)
     end
 
+    #
+    # Returns true if this option can be validated on assignment
+    #
+    def validate_on_assignment?
+      true
+    end
+
     #
     # If it's required and the value is nil or empty, then it's not valid.
     #
diff --git a/lib/msf/core/opt_path.rb b/lib/msf/core/opt_path.rb
index 6a40d48fef..23a23a1671 100644
--- a/lib/msf/core/opt_path.rb
+++ b/lib/msf/core/opt_path.rb
@@ -12,6 +12,10 @@ class OptPath < OptBase
     return 'path'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   # Generally, 'value' should be a file that exists.
   def valid?(value)
     return false if empty_required_value?(value)
diff --git a/lib/msf/core/opt_raw.rb b/lib/msf/core/opt_raw.rb
index 1ecc37f290..b144334165 100644
--- a/lib/msf/core/opt_raw.rb
+++ b/lib/msf/core/opt_raw.rb
@@ -12,6 +12,10 @@ class OptRaw < OptBase
     return 'raw'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   def normalize(value)
     if (value.to_s =~ /^file:(.*)/)
       path = $1
diff --git a/lib/msf/core/opt_string.rb b/lib/msf/core/opt_string.rb
index 8b7499a940..459ac08cc6 100644
--- a/lib/msf/core/opt_string.rb
+++ b/lib/msf/core/opt_string.rb
@@ -12,6 +12,10 @@ class OptString < OptBase
     return 'string'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   def normalize(value)
     if (value.to_s =~ /^file:(.*)/)
       path = $1