diff --git a/tasks/task_database.c b/tasks/task_database.c
index 1167dfde22..56501c35fb 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -1255,6 +1255,8 @@ static void task_database_handler(retro_task_t *task)
          {
             const char *name     = database_info_get_current_element_name(
                   dbinfo);
+            if (name == NULL)
+               goto task_finished;
 
             if (dbinfo->type == DATABASE_TYPE_ITERATE)
                if (path_contains_compressed_file(name))