diff --git a/features/support/env.rb b/features/support/env.rb
index 593e1304..5f6752aa 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -24,7 +24,7 @@ def jekyll_run_output
 end
 
 def run_jekyll(args, output_file)
-  command = "#{JEKYLL_PATH} #{args} > #{jekyll_output_file} 2>&1"
+  command = "#{JEKYLL_PATH} #{args} --trace > #{jekyll_output_file} 2>&1"
   system command
 end
 
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index d2d1ae93..ad0e5fa5 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -49,6 +49,7 @@ module Jekyll
     #
     # Returns a list of filtered entry paths.
     def filtered_entries
+      return Array.new unless exists?
       Dir.chdir(directory) do
         entry_filter.filter(entries)
       end