Index: main/db.c
===================================================================
--- main/db.c	(revision 375583)
+++ main/db.c	(working copy)
@@ -141,6 +141,30 @@
 	return 0;
 }
 
+static int clean_stmt(sqlite3_stmt *stmt, const char *sql)
+{
+	/* dblock should already be locked */
+	if (sqlite3_finalize(stmt) != SQLITE_OK) {
+		ast_log(LOG_WARNING, "Couldn't finalize statement '%s': %s\n", sql, sqlite3_errmsg(astdb));
+		return -1;
+	}
+	return 0;
+}
+
+static void clean_statements(void)
+{
+	/* dblock should already be locked */
+	clean_stmt(get_stmt, get_stmt_sql);
+	clean_stmt(del_stmt, del_stmt_sql);
+	clean_stmt(deltree_stmt, deltree_stmt_sql);
+	clean_stmt(deltree_all_stmt, deltree_all_stmt_sql);
+	clean_stmt(gettree_stmt, gettree_stmt_sql);
+	clean_stmt(gettree_all_stmt, gettree_all_stmt_sql);
+	clean_stmt(showkey_stmt, showkey_stmt_sql);
+	clean_stmt(put_stmt, put_stmt_sql);
+	clean_stmt(create_astdb_stmt, create_astdb_stmt_sql);
+}
+
 static int init_statements(void)
 {
 	/* Don't initialize create_astdb_statment here as the astdb table needs to exist
@@ -955,6 +979,7 @@
 /*! \internal \brief Clean up resources on Asterisk shutdown */
 static void astdb_atexit(void)
 {
+	ast_cli_unregister_multiple(cli_database, ARRAY_LEN(cli_database));
 	ast_manager_unregister("DBGet");
 	ast_manager_unregister("DBPut");
 	ast_manager_unregister("DBDel");
@@ -969,7 +994,9 @@
 
 	pthread_join(syncthread, NULL);
 	ast_mutex_lock(&dblock);
-	sqlite3_close(astdb);
+	clean_statements();
+	if(sqlite3_close(astdb) == SQLITE_OK)
+		astdb = NULL;
 	ast_mutex_unlock(&dblock);
 }