diff --git a/lib/linguist/pathname.rb b/lib/linguist/pathname.rb
index 4c2d7244..d459dccf 100644
--- a/lib/linguist/pathname.rb
+++ b/lib/linguist/pathname.rb
@@ -21,23 +21,11 @@ module Linguist
     end
 
     def language
-      Language.find_by_extension(extname)
+      Language.find_by_extension(extname) || Language['Text']
     end
 
     def lexer
-      if language
-        language.lexer
-      else
-        'text'
-      end
-    end
-
-    def lexer_name
-      if language
-        language.name
-      else
-        'Text'
-      end
+      language.lexer
     end
 
     def to_s
diff --git a/test/test_pathname.rb b/test/test_pathname.rb
index bcad1c75..1894c138 100644
--- a/test/test_pathname.rb
+++ b/test/test_pathname.rb
@@ -39,7 +39,7 @@ class TestPathname < Test::Unit::TestCase
     assert_equal Language['Gentoo Ebuild'], Pathname.new("file.ebuild").language
     assert_equal Language['Python'], Pathname.new("itty.py").language
     assert_equal Language['Nu'], Pathname.new("itty.nu").language
-    assert_nil Pathname.new("defun.kt").language
+    assert_equal Language['Text'], Pathname.new("defun.kt").language
   end
 
   def test_lexer
@@ -50,12 +50,4 @@ class TestPathname < Test::Unit::TestCase
     assert_equal 'scheme', Pathname.new("itty.nu").lexer
     assert_equal 'text',   Pathname.new("defun.kt").lexer
   end
-
-  def test_lexer_name
-    assert_equal 'Ruby',          Pathname.new("file.rb").lexer_name
-    assert_equal 'Gentoo Ebuild', Pathname.new("file.ebuild").lexer_name
-    assert_equal 'Ruby',          Pathname.new("Rakefile").lexer_name
-    assert_equal 'Nu',            Pathname.new("itty.nu").lexer_name
-    assert_equal 'Text',          Pathname.new("defun.kt").lexer_name
-  end
 end