diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index adf39216..e0bb1075 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -177,6 +177,11 @@ module Middleman
           super
         end
 
+        # Needed so that method_missing makes sense
+        def respond_to?(method, include_private = false)
+          super || @local_data.has_key?(method.to_s) || !!(data_for_path(method))
+        end
+
         # Convert all the data into a static hash
         #
         # @return [Hash]