diff --git a/lib/sass/script/funcall.rb b/lib/sass/script/funcall.rb
index de5f396f..d05d2cf9 100644
--- a/lib/sass/script/funcall.rb
+++ b/lib/sass/script/funcall.rb
@@ -42,7 +42,7 @@ module Sass
 
         return Functions::EvaluationContext.new(environment.options).send(name, *args)
       rescue ArgumentError => e
-        raise e unless e.backtrace.first =~ /:in `(#{name}|perform)'$/
+        raise e unless e.backtrace.first =~ /:in `(block in )?(#{name}|perform)'$/
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
     end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d1c3700c..8a1f3e22 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,7 +7,7 @@ $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 require 'sass'
 
-Sass::RAILS_LOADED = true
+Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 
 # required because of Sass::Plugin
 unless defined? RAILS_ROOT