diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34b03092..1ab214e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,14 @@ FlatLaf Change Log
 
 ## 1.5-SNAPSHOT
 
+#### Fixed bugs
+
 - InternalFrame: Limit internal frame bounds to parent bounds on resize. Also
   honor maximum size of internal frame. (issue #362)
 - Popup: Fixed incorrectly placed drop shadow for medium-weight popups in
   maximized windows. (issue #358)
+- Native window decorations: Fixed occasional application crash on Windows 10 in
+  `flatlaf-windows.dll`. (issue #357)
 
 
 ## 1.4
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 5708b1a0..e34dbdee 100644
--- a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp
+++ b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp
@@ -176,6 +176,8 @@ void FlatWndProc::updateFrame( HWND hwnd, int state ) {
 
 LRESULT CALLBACK FlatWndProc::StaticWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) {
 	FlatWndProc* fwp = (FlatWndProc*) hwndMap->get( hwnd );
+	if( fwp == NULL )
+		return 0;
 	return fwp->WindowProc( hwnd, uMsg, wParam, lParam );
 }