diff --git a/src/feature/sqlite3/no-intro.c b/src/feature/sqlite3/no-intro.c
index 7a1b60091..d54e188ff 100644
--- a/src/feature/sqlite3/no-intro.c
+++ b/src/feature/sqlite3/no-intro.c
@@ -260,8 +260,16 @@ bool NoIntroDBLoadClrMamePro(struct NoIntroDB* db, struct VFile* vf) {
 
 	free((void*) buffer.name);
 	free((void*) buffer.romName);
-	free((void*) dbType);
-	free((void*) dbVersion);
+
+	if (dbType) {
+		free(dbType);
+	}
+	if (dbVersion) {
+		free(dbVersion);
+	}
+	if (fieldName) {
+		free(fieldName);
+	}
 
 	sqlite3_finalize(gamedbTable);
 	sqlite3_finalize(gamedbDrop);
diff --git a/src/feature/updater.c b/src/feature/updater.c
index dec380d9c..442a71648 100644
--- a/src/feature/updater.c
+++ b/src/feature/updater.c
@@ -92,7 +92,7 @@ bool mUpdaterInit(struct mUpdaterContext* context, const char* manifest) {
 	ConfigurationInit(&context->manifest);
 
 	struct VFile* vf = VFileFromConstMemory(manifest, strlen(manifest) + 1);
-	bool success = vf && ConfigurationReadVFile(&context->manifest, vf);
+	bool success = ConfigurationReadVFile(&context->manifest, vf);
 	vf->close(vf);
 	if (!success) {
 		ConfigurationDeinit(&context->manifest);