Merge remote-tracking branch 'kou/fix-error-message'

lib/jekyll/convertible.rb

@@ -78,7 +78,7 @@ module Jekyll
       begin
         self.content = Liquid::Template.parse(self.content).render(payload, info)
       rescue => e
-        puts "Liquid Exception: #{e.message} in #{self.data["layout"]}"
+        puts "Liquid Exception: #{e.message} in #{self.name}"
       end
 
       self.transform