diff --git a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp
index 41b55c40..df825872 100644
--- a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp
+++ b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp
@@ -154,7 +154,7 @@ void FlatWndProc::uninstall( JNIEnv *env, jobject obj, HWND hwnd ) {
 	env->DeleteGlobalRef( fwp->obj );
 	if( fwp->background != NULL )
 		::DeleteObject( fwp->background );
-	FlatLafWin32ProcessHeapDelete(fwp);
+	FlatLafWin32ProcessHeapFree(fwp);
 }
 
 void FlatWndProc::initIDs( JNIEnv *env, jobject obj ) {
diff --git a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/HWNDMap.cpp b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/HWNDMap.cpp
index cf9e2822..44796c8e 100644
--- a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/HWNDMap.cpp
+++ b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/HWNDMap.cpp
@@ -47,7 +47,7 @@ public:
 HWNDMap::HWNDMap() {
 	size = 0;
 	capacity = DEFAULT_CAPACITY;
-	table = new Entry[capacity];
+	table = new (FlatLafNoThrow) Entry[capacity];
 
 	::InitializeCriticalSection( &criticalSection );