diff --git a/cache-sqlite.c b/cache-sqlite.c
index 2821e90..d9886ca 100644
--- a/cache-sqlite.c
+++ b/cache-sqlite.c
@@ -177,6 +177,7 @@ tdpkg_cache_finalize (void)
   if (db)
     sqlite3_close (db);
   sqlite3_shutdown ();
+  db = NULL;
 }
 
 char*
diff --git a/cache-tokyo.c b/cache-tokyo.c
index ebd181e..cb284a0 100644
--- a/cache-tokyo.c
+++ b/cache-tokyo.c
@@ -36,7 +36,7 @@ static TCHDB* db = NULL;
 static int in_transaction = 0;
 static int is_write = 0;
 
-#define tc_error(ret) { abort();fprintf (stderr, "tdpkg tokio: %s\n", tchdberrmsg (tchdbecode (db))); return ret; }
+#define tc_error(ret) { fprintf (stderr, "tdpkg tokio: %s\n", tchdberrmsg (tchdbecode (db))); return ret; }
 
 static int
 _tokyo_init (int write)