1 files changed, 3 insertions, 5 deletions
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb
index 445439aa3..3d13af1f8 100644
--- a/lib/puppet/node/environment.rb
+++ b/lib/puppet/node/environment.rb
@@ -30,11 +30,9 @@ class Puppet::Node::Environment
     end
 
     def module(name)
-        Puppet::Module.each_module(modulepath) do |mod|
-            return mod if mod.name == name
-        end
-
-        return nil
+        mod = Puppet::Module.new(name, self)
+        return nil unless mod.exist?
+        return mod
     end
 
     def modulepath