diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp
index f2b39b8d3..8f6a483e6 100644
--- a/PowerEditor/src/MISC/Common/Common.cpp
+++ b/PowerEditor/src/MISC/Common/Common.cpp
@@ -1079,6 +1079,13 @@ bool isCertificateValidated(const generic_string & fullFilePath, const generic_s
 		{
 			throw generic_string(TEXT("Certificate checking error: the certificate is not matched."));
 		}
+
+		// Clean up.
+		if (pSignerInfo != NULL) LocalFree(pSignerInfo);
+		if (pCertContext != NULL) CertFreeCertificateContext(pCertContext);
+		if (hStore != NULL) CertCloseStore(hStore, 0);
+		if (hMsg != NULL) CryptMsgClose(hMsg);
+		if (szName != NULL) LocalFree(szName);
 	}
 	catch (generic_string s)
 	{