diff --git a/tasks/task_database.c b/tasks/task_database.c
index 1160d5e13f..d3ffdf64a3 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -435,7 +435,7 @@ static int database_info_iterate_serial_lookup(
                    db_state->serial, db_info_entry->serial, db_info_entry->name);
 #endif
          if (!strcmp(db_state->serial, db_info_entry->serial))
-            database_info_list_iterate_found_match(db_state, db, NULL);
+            return database_info_list_iterate_found_match(db_state, db, NULL);
       }
    }
 
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index baec639ffe..2900126e07 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -111,7 +111,7 @@ static ssize_t get_token(RFILE *fd, char *token, size_t max_len)
 static int find_token(RFILE *fd, const char *token)
 {
    int     tmp_len = strlen(token);
-   char *tmp_token = (char*)calloc(tmp_len, 1);
+   char *tmp_token = (char*)calloc(tmp_len+1, 1);
 
    if (!tmp_token)
       return -1;
@@ -122,6 +122,8 @@ static int find_token(RFILE *fd, const char *token)
          return -1;
    }
 
+   free(tmp_token);
+
    return 0;
 }