diff --git a/lib/sass/plugin.rb b/lib/sass/plugin.rb
index fd63ebaf..7165fc87 100644
--- a/lib/sass/plugin.rb
+++ b/lib/sass/plugin.rb
@@ -30,7 +30,7 @@ module Sass
       def options=(value)
         @@options.merge!(value)
       end
-      
+
       # Checks each stylesheet in <tt>options[:css_location]</tt>
       # to see if it needs updating,
       # and updates it using the corresponding template
@@ -38,54 +38,30 @@ module Sass
       # if it does.
       def update_stylesheets
         Dir.glob(File.join(options[:template_location], "**", "*.sass")).entries.each do |file|
-          
+
           # Get the relative path to the file with no extension
           name = file.sub(options[:template_location] + "/", "")[0...-5]
-                    
+
           if options[:always_update] || stylesheet_needs_update?(name)
             css = css_filename(name)
             File.delete(css) if File.exists?(css)
-            
+
             filename = template_filename(name)
             l_options = @@options.dup
             l_options[:filename] = filename
             l_options[:load_paths] = (l_options[:load_paths] || []) + [l_options[:template_location]]
             engine = Engine.new(File.read(filename), l_options)
-            begin
-              result = engine.render
-            rescue Exception => e
-              if RAILS_ENV != "production"
-                e_string = "#{e.class}: #{e.message}"
+            result = begin
+                       engine.render
+                     rescue Exception => e
+                       exception_string(e)
+                     end
 
-                if e.is_a? Sass::SyntaxError
-                  e_string << "\non line #{e.sass_line}"
-
-                  if e.sass_filename
-                    e_string << " of #{e.sass_filename}"
-
-                    if File.exists?(e.sass_filename)
-                      e_string << "\n\n"
-
-                      min = [e.sass_line - 5, 0].max
-                      File.read(e.sass_filename).rstrip.split("\n")[
-                          min .. e.sass_line + 5
-                      ].each_with_index do |line, i|
-                        e_string << "#{min + i + 1}: #{line}\n"
-                      end
-                    end
-                  end
-                end
-                result = "/*\n#{e_string}\n\nBacktrace:\n#{e.backtrace.join("\n")}\n*/"
-              else
-                result = "/* Internal stylesheet error */"
-              end
-            end
-            
             # Create any directories that might be necessary
             dirs = [l_options[:css_location]]
             name.split("/")[0...-1].each { |dir| dirs << "#{dirs[-1]}/#{dir}" }
             dirs.each { |dir| Dir.mkdir(dir) unless File.exist?(dir) }
-            
+
             # Finally, write the file
             File.open(css, 'w') do |file|
               file.print(result)
@@ -93,17 +69,45 @@ module Sass
           end
         end
       end
-      
+
       private
-      
+
+      def exception_string(e)
+        if RAILS_ENV != "production"
+          e_string = "#{e.class}: #{e.message}"
+
+          if e.is_a? Sass::SyntaxError
+            e_string << "\non line #{e.sass_line}"
+
+            if e.sass_filename
+              e_string << " of #{e.sass_filename}"
+
+              if File.exists?(e.sass_filename)
+                e_string << "\n\n"
+
+                min = [e.sass_line - 5, 0].max
+                File.read(e.sass_filename).rstrip.split("\n")[
+                  min .. e.sass_line + 5
+                ].each_with_index do |line, i|
+                  e_string << "#{min + i + 1}: #{line}\n"
+                end
+              end
+            end
+          end
+          "/*\n#{e_string}\n\nBacktrace:\n#{e.backtrace.join("\n")}\n*/"
+        else
+          "/* Internal stylesheet error */"
+        end
+      end
+
       def template_filename(name)
         "#{@@options[:template_location]}/#{name}.sass"
       end
-      
+
       def css_filename(name)
         "#{@@options[:css_location]}/#{name}.css"
       end
-      
+
       def stylesheet_needs_update?(name)
         !File.exists?(css_filename(name)) || (File.mtime(template_filename(name)) - 2) > File.mtime(css_filename(name))
       end