diff --git a/Puppetfile b/Puppetfile
index 48eb127cd..2d037c34e 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -99,7 +99,7 @@ mod 'module-collectd',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',
-  :commit => '0eead7f411f404b0a9a73bb161aac46c9fbe3219',
+  :commit => 'b2a2bec34005004bfecb6d258d8e3c4c82abc860',
   :git => 'https://github.com/ripienaar/puppet-module-data.git'
 
 mod 'mongodb',
diff --git a/module-data/lib/hiera/backend/module_data_backend.rb b/module-data/lib/hiera/backend/module_data_backend.rb
index 94cd72ccb..e6768977c 100644
--- a/module-data/lib/hiera/backend/module_data_backend.rb
+++ b/module-data/lib/hiera/backend/module_data_backend.rb
@@ -13,7 +13,7 @@ def initialize(cache=nil)
       def load_module_config(module_name, environment)
         default_config = {:hierarchy => ["common"]}
 
-        mod = Puppet::Module.find(module_name, environment)
+        mod = Puppet::Module.find(module_name) unless Puppet::Module.find(module_name, environment)
 
         return default_config unless mod