diff --git a/src/file_analysis/File.h b/src/file_analysis/File.h
index f4278500a5..5b43549aff 100644
--- a/src/file_analysis/File.h
+++ b/src/file_analysis/File.h
@@ -74,7 +74,7 @@ public:
 	/**
 	 * @return value of the "id" field from #val record.
 	 */
-	std::string GetID() const { return id; }
+	const std::string& GetID() const { return id; }
 
 	/**
 	 * @return value of "last_active" field in #val record;
diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc
index cfc61d33ae..3c09498a4b 100644
--- a/src/file_analysis/Manager.cc
+++ b/src/file_analysis/Manager.cc
@@ -396,10 +396,10 @@ bool Manager::RemoveFile(const string& file_id)
 	DBG_LOG(DBG_FILE_ANALYSIS, "[%s] Remove file", file_id.c_str());
 
 	f->EndOfFile();
-	delete f;
 
 	id_map.erase(file_id);
 	ignored.erase(file_id);
+	delete f;
 	return true;
 	}