diff --git a/.gitignore b/.gitignore
index a978261..916c407 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.ogg
 *.coverage
 *.ui~
+*.txt
diff --git a/curds/tags.py b/curds/tags.py
index 3caf37a..4aff3c7 100644
--- a/curds/tags.py
+++ b/curds/tags.py
@@ -74,7 +74,10 @@ class Track(Tag):
                           self.tracknumber, self.discnumber))
 
     def lookup(path):
-        return Tag.lookup(Track(path), "new-track")
+        try:
+            return Tag.lookup(Track(path), "new-track")
+        except Exception as e:
+            return None
 
 
 def save():
diff --git a/curds/test_tags_track.py b/curds/test_tags_track.py
index 56c2387..8084c9a 100644
--- a/curds/test_tags_track.py
+++ b/curds/test_tags_track.py
@@ -62,6 +62,10 @@ class TestTrackTag(unittest.TestCase):
         self.assertEqual(tags.Track(join(test_tracks, "09 - Test {Disc 02}.ogg")).discnumber,    2)
         self.assertEqual(tags.Track(join(test_tracks, "10 - Test {Disc 20}.ogg")).discnumber,   20)
 
+    def test_track_exceptiddon(self):
+        self.assertIsNone(tags.Track.lookup(os.path.join(test_tracks, "text.txt")))
+        self.assertIsNone(tags.Track.lookup(os.path.join(test_tracks, "test.txt")))
+
     def on_new_track(self, track):
         self.cb_track = track
 
diff --git a/trier/generate_tracks.py b/trier/generate_tracks.py
index 51d258a..b9c99bf 100644
--- a/trier/generate_tracks.py
+++ b/trier/generate_tracks.py
@@ -50,6 +50,8 @@ generate_track(60, "Test Album/11 - Test Track 11.ogg", { "Title" : "Test Track
                                                           "album" : "Test Album 11",
                                                           "discnumber"  : "1/1",
                                                           "tracknumber" : "11/100" })
+with open(os.path.join(trier, "Test Album/text.txt"), 'w') as f:
+    f.write("Test Text")
 
 # Create a giant library for testing
 for artistno in range(1, 26):