diff --git a/puppet/files/puppet-check b/puppet/files/puppet-check
index 682c239..6727b6f 100755
--- a/puppet/files/puppet-check
+++ b/puppet/files/puppet-check
@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
 
+if not defined? ::Bundler
+  begin
+    require 'rubygems'
+  rescue LoadError
+  end
+end
+
+require "puppet"
 require "syslog"
 require "socket"
 
-begin
-    require "puppet"
-rescue LoadError
-    require "rubygems"
-    require "puppet"
-end
-
 Syslog.open(File.basename(__FILE__), Syslog::LOG_PID | Syslog::LOG_NDELAY,
             Syslog::LOG_DAEMON)
 
@@ -75,4 +76,3 @@ Syslog.warning err
 system("service --help > /dev/null 2>&1 && service puppet start > /dev/null")
 system(puppetd) if $?.exitstatus == 127
 Syslog.close
-