diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 084254bd3..f56ca84f8 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -69,10 +69,11 @@ module VagrantPlugins
 
           # Manifests path/file validation
           if manifests_path[0].to_sym == :host
-            expanded_path = File.expand_path(manifests_path[1], machine.env.root_path)
-            if expanded_path.directory?
+            expanded_path = Pathname.new(manifests_path[1]).
+              expand_path(machine.env.root_path)
+            if !expanded_path.directory?
               errors << I18n.t("vagrant.provisioners.puppet.manifests_path_missing",
-                               :path => this_expanded_manifests_path)
+                               :path => expanded_path.to_s)
             else
               expanded_manifest_file = expanded_path.join(manifest_file)
               if !expanded_manifest_file.file?
diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 86247e4e1..068dd88a0 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -45,7 +45,10 @@ module VagrantPlugins
 
         def provision
           # Check that the shared folders are properly shared
-          check = [manifests_guest_path]
+          check = []
+          if @config.manifests_path[0] == :host
+            check << manifests_guest_path
+          end
           @module_paths.each do |host_path, guest_path|
             check << guest_path
           end