diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 0e4fabaeb..37584fa11 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -117,8 +117,8 @@ module VagrantPlugins
           # Calculate the manifests and module paths based on env
           this_expanded_module_paths = expanded_module_paths(machine.env.root_path)
 
-          if environment_path != UNSET_VALUE && manifests_path != UNSET_VALUE
-              errors << "You may not specify both environment_path and manifests_path. Please specify environment and environment_path only"
+          if environment_path != nil && manifests_path != nil
+              errors << I18n.t("vagrant.provisioners.puppet.environment_manifest_conflict")
           end
 
           # Manifests path/file validation
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 5159c6c9a..8ddc475db 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1859,16 +1859,15 @@ en:
 
           %{manifest}
         environment_missing: |-
-          The configured Puppet environment folder '%{environment}' was not found in the 
+          The configured Puppet environment folder %{environment} was not found in the 
           specified environmentpath %{environmentpath}.
           Please specify a path to an existing Puppet directory environment.
+        environment_path_missing: "The environment path specified for Puppet does not exist: %{path}"
         manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
-        manifest_missing: |-
-          The configured Puppet envrionment is missing. Please specify a path to an
-          existing envrionment file:
-
-          %{environment}
-        manifests_path_missing: "The environment path specified for Puppet does not exist: %{path}"
+        environment_manifest_conflict: |-
+          You may not specify both environment_path and manifests_path. 
+          Please specify environment and environment_path without manifests_path, or
+          manifests_path without environment_path (deprecated).
         missing_shared_folders: |-
           Shared folders that Puppet requires are missing on the virtual machine.
           This is usually due to configuration changing after already booting the