diff -r 5af1602f5c66 -r 843e629627bf src/pEpEngine.c
--- a/src/pEpEngine.c	Mon Sep 01 17:50:28 2014 +0200
+++ b/src/pEpEngine.c	Mon Sep 01 18:36:42 2014 +0200
@@ -32,7 +32,7 @@
 	
 	_session->version = PEP_ENGINE_VERSION;
 
-    status_result = pgp_init(session);
+    status_result = pgp_init(_session);
     assert(status_result == PEP_STATUS_OK);
     if (status_result != PEP_STATUS_OK) {
         free(_session);
@@ -244,6 +244,11 @@
 			sqlite3_finalize(_session->log);
 			sqlite3_finalize(_session->get_identity);
 			sqlite3_finalize(_session->set_identity);
+            sqlite3_finalize(_session->set_person);
+            sqlite3_finalize(_session->set_pgp_keypair);
+            sqlite3_finalize(_session->set_trust);
+            sqlite3_finalize(_session->get_trust);
+
 			sqlite3_close_v2(_session->db);
 			sqlite3_close_v2(_session->system_db);
 		}