diff --git a/songbook b/songbook
index 366f8afd..3f1ee611 100755
--- a/songbook
+++ b/songbook
@@ -116,6 +116,8 @@ def main():
                                              path
                                              )
                                 )
+            else:
+                datadirs.append(path)
     except KeyError:
         datadirs = [os.path.dirname(songbook_path)]
 
diff --git a/songbook_core/songs.py b/songbook_core/songs.py
index cc4ebbed..2bd1fc2e 100644
--- a/songbook_core/songs.py
+++ b/songbook_core/songs.py
@@ -131,7 +131,7 @@ class SongbookContent(object):
                 if len(self.content) == before:
                     # No songs were added
                     LOGGER.warning(
-                            "Expression '{}' did not match any file".format(regexp)
+                            "Expression '{}' did not match any file".format(elem)
                             )
             else:
                 self.append(type, elem)