diff --git a/lib/facter/vcsrepo_svn_ver.rb b/lib/facter/vcsrepo_svn_ver.rb
index c5b85938..53541d68 100644
--- a/lib/facter/vcsrepo_svn_ver.rb
+++ b/lib/facter/vcsrepo_svn_ver.rb
@@ -2,17 +2,19 @@
 
 Facter.add(:vcsrepo_svn_ver) do
   setcode do
-    if Facter.value(:operatingsystem) == 'Darwin' && !File.directory?(Facter::Core::Execution.execute('xcode-select -p'))
-      ''
-    else
-      version = Facter::Core::Execution.execute('svn --version --quiet')
-      if Gem::Version.new(version) > Gem::Version.new('0.0.1')
-        version
-      else
+    begin
+      if Facter.value(:operatingsystem) == 'Darwin' && !File.directory?(Facter::Core::Execution.execute('xcode-select -p'))
         ''
+      else
+        version = Facter::Core::Execution.execute('svn --version --quiet')
+        if Gem::Version.new(version) > Gem::Version.new('0.0.1')
+          version
+        else
+          ''
+        end
       end
+    rescue StandardError
+      ''
     end
-  rescue StandardError
-    ''
   end
 end
diff --git a/lib/puppet/provider/vcsrepo/bzr.rb b/lib/puppet/provider/vcsrepo/bzr.rb
index 30ac813e..86d50860 100644
--- a/lib/puppet/provider/vcsrepo/bzr.rb
+++ b/lib/puppet/provider/vcsrepo/bzr.rb
@@ -55,9 +55,11 @@ def revision
 
   def revision=(desired)
     at_path do
-      bzr('update', '-r', desired)
-    rescue Puppet::ExecutionFailure
-      bzr('update', '-r', desired, ':parent')
+      begin
+        bzr('update', '-r', desired)
+      rescue Puppet::ExecutionFailure
+        bzr('update', '-r', desired, ':parent')
+      end
     end
     update_owner
   end
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
index 4d33a6ef..5a651bf0 100644
--- a/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@ -289,10 +289,12 @@ def convert_bare_to_working_copy
 
   def mirror?
     at_path do
-      git_with_identity('config', '--get-regexp', 'remote\..*\.mirror')
-      return true
-    rescue Puppet::ExecutionFailure
-      return false
+      begin
+        git_with_identity('config', '--get-regexp', 'remote\..*\.mirror')
+        return true
+      rescue Puppet::ExecutionFailure
+        return false
+      end
     end
   end
 
@@ -310,17 +312,21 @@ def set_mirror
 
   def set_no_mirror
     at_path do
-      if @resource.value(:source).is_a?(String)
-        begin
-          exec_git('config', '--unset', "remote.#{@resource.value(:remote)}.mirror")
-        rescue Puppet::ExecutionFailure
-          next
-        end
-      else
-        @resource.value(:source).each_key do |remote|
-          exec_git('config', '--unset', "remote.#{remote}.mirror")
-        rescue Puppet::ExecutionFailure
-          next
+      begin
+        if @resource.value(:source).is_a?(String)
+          begin
+            exec_git('config', '--unset', "remote.#{@resource.value(:remote)}.mirror")
+          rescue Puppet::ExecutionFailure
+            next
+          end
+        else
+          @resource.value(:source).each_key do |remote|
+            begin
+              exec_git('config', '--unset', "remote.#{remote}.mirror")
+            rescue Puppet::ExecutionFailure
+              next
+            end
+          end
         end
       end
     end
@@ -721,7 +727,7 @@ def exec_git(*args)
       exec_args[:uid] = @resource.value(:user)
     end
     withumask do
-      Puppet::Util::Execution.execute([:git, args], **exec_args)
+      Puppet::Util::Execution.execute([:git, args], exec_args)
     end
   end
 end
diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb
index e626d988..1b207735 100644
--- a/lib/puppet/provider/vcsrepo/hg.rb
+++ b/lib/puppet/provider/vcsrepo/hg.rb
@@ -45,10 +45,12 @@ def latest?
 
   def latest
     at_path do
-      hg_wrapper('incoming', '--branch', '.', '--newest-first', '--limit', '1', remote: true)[%r{^changeset:\s+(?:-?\d+):(\S+)}m, 1]
-    rescue Puppet::ExecutionFailure
-      # If there are no new changesets, return the current nodeid
-      revision
+      begin
+        hg_wrapper('incoming', '--branch', '.', '--newest-first', '--limit', '1', remote: true)[%r{^changeset:\s+(?:-?\d+):(\S+)}m, 1]
+      rescue Puppet::ExecutionFailure
+        # If there are no new changesets, return the current nodeid
+        revision
+      end
     end
   end