diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index 166857f43..07267cb98 100644
--- a/src/charon/daemon.c
+++ b/src/charon/daemon.c
@@ -670,6 +670,7 @@ int main(int argc, char *argv[])
 	/* initialize library */
 	if (!library_init(STRONGSWAN_CONF))
 	{
+		library_deinit();
 		exit(-1);
 	}
 	
diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c
index b0710fa13..e03496796 100644
--- a/src/pluto/plutomain.c
+++ b/src/pluto/plutomain.c
@@ -262,6 +262,7 @@ int main(int argc, char **argv)
 	/* initialize library and optionsfrom */
 	if (!library_init(STRONGSWAN_CONF))
 	{
+		library_deinit();
 		abort();
 	}
 	if (lib->integrity &&