Fix tests and clean up import errors.

lib/sass/tree/import_node.rb

@@ -55,13 +55,18 @@ def import
           return f if f
         end
 
-        message = "File to import not found or unreadable: #{@imported_filename}.\n"
+        lines = ["File to import not found or unreadable: #{@imported_filename}."]
+
+        if @options[:importer]
+          lines << "Relative to #{@options[:filename]}"
+        end
+
         if paths.size == 1
-          message << "Load path: #{paths.first}"
-        else
-          message << "Load paths:\n  " << paths.join("\n  ")
+          lines << "Load path: #{paths.first}"
+        elsif !paths.empty?
+          lines << "Load paths:\n  #{paths.join("\n  ")}"
         end
-        raise SyntaxError.new(message)
+        raise SyntaxError.new(lines.join("\n"))
       rescue SyntaxError => e
         raise SyntaxError.new(e.message, :line => line, :filename => @filename)
       end

test/sass/engine_test.rb

@@ -680,7 +680,7 @@ def test_import_from_global_load_paths
   def test_nonexistent_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.sass.
-Load path: #{Dir.pwd}
+Relative to test_nonexistent_import_inline.sass
 ERR
       render("@import nonexistent.sass")
     end
@@ -689,7 +689,7 @@ def test_nonexistent_import
   def test_nonexistent_extensionless_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.
-Load path: #{Dir.pwd}
+Relative to test_nonexistent_extensionless_import_inline.sass
 ERR
       render("@import nonexistent")
     end