diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3201a9df..d7149d70 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -208,8 +208,10 @@ module Jekyll
     end
 
     def read_things(dir, magic_dir, klass)
-      things = get_entries(dir, magic_dir).map do |entry|
+      get_entries(dir, magic_dir).map do |entry|
         klass.new(self, self.source, dir, entry) if klass.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
       end
     end