diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index e44b95f352..3f5884de67 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4289,9 +4289,7 @@ bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window )
 
 bool wxWindowGTK::SetFont( const wxFont &font )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
-
-    if (!wxWindowBase::SetFont(font))
+    if (!wxWindowBase::SetFont(font) || !m_widget)
     {
         return FALSE;
     }
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index e44b95f352..3f5884de67 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4289,9 +4289,7 @@ bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window )
 
 bool wxWindowGTK::SetFont( const wxFont &font )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
-
-    if (!wxWindowBase::SetFont(font))
+    if (!wxWindowBase::SetFont(font) || !m_widget)
     {
         return FALSE;
     }