diff --git a/plugins/Lookup.py b/plugins/Lookup.py
index 9bcec54cc..08420ba5a 100644
--- a/plugins/Lookup.py
+++ b/plugins/Lookup.py
@@ -136,9 +136,9 @@ class Lookup(callbacks.Privmsg):
             cursor.execute("""CREATE TABLE %s (key TEXT, value TEXT)""" % name)
             sql = """INSERT INTO %s VALUES (%%s, %%s)""" % name
             for line in fd:
-                if line.startswith('#'):
-                    continue
                 line = line.rstrip('\r\n')
+                if not line or line.startswith('#'):
+                    continue
                 try:
                     (key, value) = line.split(':', 1)
                 except ValueError:
diff --git a/test/test_Lookup.py b/test/test_Lookup.py
index 8744b64b1..fb49e0fe8 100644
--- a/test/test_Lookup.py
+++ b/test/test_Lookup.py
@@ -72,6 +72,12 @@ class LookupTestCase(PluginTestCase, PluginDocumentation):
 
         def testNotEscapingIOError(self):
             self.assertNotRegexp('lookup add foo asdlfkjsdalfkj', 'IOError')
+
+        def testEmptyLines(self):
+            fd = file(os.path.join(conf.dataDir, 'foo.supyfact'), 'a')
+            fd.write('\n')
+            fd.close()
+            self.assertNotError('lookup add test foo.supyfact')