2 files changed, 15 insertions, 13 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb
index b0d80caa6..f30b862ef 100644
--- a/lib/puppet/module.rb
+++ b/lib/puppet/module.rb
@@ -2,20 +2,16 @@ require 'puppet/util/logging'
 
 # Support for modules
 class Puppet::Module
-    class MissingModule < Puppet::Error; end
-    class IncompatibleModule < Puppet::Error; end
-    class UnsupportedPlatform < Puppet::Error; end
-    class IncompatiblePlatform < Puppet::Error; end
-    class MissingMetadata < Puppet::Error; end
+    class Error < Puppet::Error; end
+    class MissingModule < Error; end
+    class IncompatibleModule < Error; end
+    class UnsupportedPlatform < Error; end
+    class IncompatiblePlatform < Error; end
+    class MissingMetadata < Error; end
+    class InvalidName < Error; end
 
     include Puppet::Util::Logging
 
-    class InvalidName < ArgumentError
-        def message
-            "Invalid module name; module names must be alphanumeric (plus '-')"
-        end
-    end
-
     TEMPLATES = "templates"
     FILES = "files"
     MANIFESTS = "manifests"
@@ -215,6 +211,6 @@ class Puppet::Module
     end
 
     def assert_validity
-        raise InvalidName unless name =~ /^[-\w]+$/
+        raise InvalidName, "Invalid module name; module names must be alphanumeric (plus '-')" unless name =~ /^[-\w]+$/
     end
 end
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb
index 94f899200..395d50657 100644
--- a/lib/puppet/node/environment.rb
+++ b/lib/puppet/node/environment.rb
@@ -62,7 +62,13 @@ class Puppet::Node::Environment
     # Cache the list, because it can be expensive to create.
     cached_attr(:modules, :ttl => Puppet[:filetimeout]) do
         module_names = modulepath.collect { |path| Dir.entries(path) }.flatten.uniq
-        module_names.collect { |path| Puppet::Module.new(path, self) rescue nil }.compact
+        module_names.collect do |path|
+            begin
+                Puppet::Module.new(path, self)
+            rescue Puppet::Module::Error => e
+                nil
+            end
+        end.compact
     end
 
     # Cache the manifestdir, so that we aren't searching through