diff --git a/test/test_secio.h b/test/test_secio.h
index a8fb8ba..1e83b53 100644
--- a/test/test_secio.h
+++ b/test/test_secio.h
@@ -87,7 +87,6 @@ int test_secio_handshake() {
 		free(decode_base64);
 	if (rsa_private_key != NULL)
 		libp2p_crypto_rsa_rsa_private_key_free(rsa_private_key);
-	libp2p_logger_free();
 	return retVal;
 }
 
diff --git a/test/testit.c b/test/testit.c
index 2166877..f413145 100644
--- a/test/testit.c
+++ b/test/testit.c
@@ -13,6 +13,7 @@
 #include "test_conn.h"
 #include "test_record.h"
 #include "test_peer.h"
+#include "libp2p/utils/logger.h"
 
 const char* names[] = {
 		"test_public_der_to_private_der",
@@ -153,6 +154,7 @@ int main(int argc, char** argv) {
 			printf("All %d tests passed\n", tests_ran);
 		}
 	}
+	libp2p_logger_free();
 	return 1;
 }
 
diff --git a/utils/logger.c b/utils/logger.c
index 36e490e..9ba79b6 100644
--- a/utils/logger.c
+++ b/utils/logger.c
@@ -29,10 +29,12 @@ int libp2p_logger_initialized() {
 }
 
 int libp2p_logger_free() {
-	for(int i = 0; i < logger_classes->total; i++) {
-		free(libp2p_utils_vector_get(logger_classes, i));
+	if (logger_classes != NULL) {
+		for(int i = 0; i < logger_classes->total; i++) {
+			free(libp2p_utils_vector_get(logger_classes, i));
+		}
+		libp2p_utils_vector_free(logger_classes);
 	}
-	libp2p_utils_vector_free(logger_classes);
 	return 1;
 }