diff --git a/lib/puppet_x/ldapquery.rb b/lib/puppet_x/ldapquery.rb
index 2880ca7..411c5db 100644
--- a/lib/puppet_x/ldapquery.rb
+++ b/lib/puppet_x/ldapquery.rb
@@ -59,7 +59,6 @@ module PuppetX
         }
       end
 
-      Puppet.debug(conf)
       return conf
     end
 
@@ -73,8 +72,7 @@ module PuppetX
 
       conf = self.get_config()
 
-      Puppet.debug("Searching ldap base #{base} using #{@filter} for #{@attributes}")
-
+      start_time = Time.now
       ldap = Net::LDAP.new(conf)
       ldapfilter = Net::LDAP::Filter.construct(@filter)
 
@@ -87,9 +85,14 @@ module PuppetX
                     :time => 10) do |entry|
           entries << entry
         end
-        Puppet.debug(entries)
+        end_time = Time.now
+        time_delta = sprintf('%.3f', end_time - start_time)
+
+        Puppet.debug("Searching #{@base} for #{@attributes} using #{@filter} took #{time_delta} seconds")
         return entries
-      rescue
+      rescue Exception => e
+        Puppet.debug('There was an error searching LDAP #{e.message}')
+        Puppet.debug('Returning empty array')
         return []
       end
     end