diff --git a/apps/apps.c b/apps/apps.c
index bdd14dd51bd8967551479a73e3fabf4d314f4e42..6092c395e534c45b49058e00fbbb140c83ff5bcd 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1873,6 +1873,9 @@ int rotate_index(char *dbfile, char *new_suffix, char *old_suffix)
 
 void free_index(CA_DB *db)
 	{
-	TXT_DB_free(db->db);
-	OPENSSL_free(db);
+	if (db)
+		{
+		if (db->db) TXT_DB_free(db->db);
+		OPENSSL_free(db);
+		}
 	}