diff --git a/composite.cpp b/composite.cpp
index c63decd292..0967dfb8b4 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -548,6 +548,8 @@ void Toplevel::addWorkspaceRepaint( const QRect& r2 )
     {
     if( !compositing())
         return;
+    if( effectWindow() == NULL ) // TODO - this can happen during window destruction
+        return workspace()->addRepaint( r2 );
     QRect r = effects->transformWindowDamage( effectWindow(), r2 );
     workspace()->addRepaint( r );
     }