diff --git a/src/commandconf.c b/src/commandconf.c
index fdf649a9..9ed258e2 100644
--- a/src/commandconf.c
+++ b/src/commandconf.c
@@ -1,6 +1,6 @@
 /* aide, Advanced Intrusion Detection Environment
  *
- * Copyright (C) 1999-2006,2010,2011,2013,2015,2016,2019 Rami Lehti, Pablo
+ * Copyright (C) 1999-2006,2010,2011,2013,2015,2016,2019,2020 Rami Lehti, Pablo
  * Virolainen, Richard van den Berg, Hannes von Haugwitz
  * $Header$
  *
diff --git a/src/gen_list.c b/src/gen_list.c
index dd864174..8637b6b7 100644
--- a/src/gen_list.c
+++ b/src/gen_list.c
@@ -1222,13 +1222,13 @@ void populate_tree(seltree* tree)
                 } else if (conf->limit!=NULL && add < 0) {
                     add_file_to_tree(tree,old,DB_OLD|DB_NEW,attr);
                 }else{
-                    free_db_line(old);
-                    free(old);
-                    old=NULL;
                     if(!initdbwarningprinted){
-                        error(3,_("WARNING: Old db contains a entry that shouldn\'t be there, run --init or --update\n"));
+                        error(3,_("WARNING: old database entry '%s' has no matching rule, run --init or --update (this warning is only shown once)\n"), old->filename);
                         initdbwarningprinted=1;
                     }
+                    free_db_line(old);
+                    free(old);
+                    old=NULL;
                 }
             }
     }