diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index aa02068d..fcfac9e9 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -35,7 +35,7 @@ module Jekyll
           self.data = YAML.safe_load($1)
         end
       rescue SyntaxError => e
-        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"        
+        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
       rescue Exception => e
         puts "Error reading file #{File.join(base, name)}: #{e.message}"
       end
@@ -77,10 +77,7 @@ module Jekyll
       Liquid::Template.parse(content).render!(payload, info)
     rescue Exception => e
       Jekyll::Stevenson.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
-      e.backtrace.each do |backtrace|
-        puts backtrace
-      end
-      abort("Build Failed")
+      raise e
     end
 
     # Recursively render layouts
@@ -99,7 +96,7 @@ module Jekyll
         payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
 
         self.output = self.render_liquid(layout.content,
-                                         payload.merge({:file => self.data["layout"]}),
+                                         payload.merge({:file => layout.name}),
                                          info)
 
         if layout = layouts[layout.data["layout"]]
diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb
index 1db6fe94..f75a4780 100644
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -5,6 +5,9 @@ module Jekyll
     # Gets the Site object.
     attr_reader :site
 
+    # Gets the name of this layout.
+    attr_reader :name
+
     # Gets/Sets the extension of this layout.
     attr_accessor :ext