diff --git a/client.cpp b/client.cpp
index d4f5440772..6cdcc7eedf 100644
--- a/client.cpp
+++ b/client.cpp
@@ -439,7 +439,7 @@ void Client::detectNoBorder()
             noborder = false;
           break;
         default:
-            assert( false );
+            abort();
         }
     // NET::Override is some strange beast without clear definition, usually
     // just meaning "noborder", so let's treat it only as such flag, and ignore it as
diff --git a/effects.cpp b/effects.cpp
index f7a7fa77e6..c4bc449ba3 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -612,7 +612,7 @@ void EffectsHandlerImpl::destroyInputWindow( Window w )
             return;
             }
         }
-    assert( false );
+    abort();
     }
 
 bool EffectsHandlerImpl::checkInputWindowEvent( XEvent* e )
diff --git a/effects/presentwindows.cpp b/effects/presentwindows.cpp
index 450e66554a..47ba3524b7 100644
--- a/effects/presentwindows.cpp
+++ b/effects/presentwindows.cpp
@@ -1330,7 +1330,7 @@ EffectWindow* PresentWindowsEffect::relativeWindow( EffectWindow* w, int xdiff,
             }
         }
 
-    assert( false ); // Should never get here
+    abort(); // Should never get here
     }
 
 EffectWindow* PresentWindowsEffect::relativeWindowGrid( EffectWindow* w, int xdiff, int ydiff, bool wrap ) const
diff --git a/geometry.cpp b/geometry.cpp
index 0439e6ed48..fa828070d0 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -271,8 +271,7 @@ QRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) con
         case ScreenArea:
             return desktopwidget->screenGeometry( screen );
         }
-    assert( false );
-    return QRect();
+    abort();
     }
 
 QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop ) const
@@ -555,7 +554,7 @@ QRect Workspace::adjustClientSize( Client* c, QRect moveResizeGeom, int mode )
                         SNAP_BORDER_LEFT
                         break;
                       default:
-                        assert( false );
+                        abort();
                         break;
                       }
 
@@ -688,7 +687,7 @@ QRect Workspace::adjustClientSize( Client* c, QRect moveResizeGeom, int mode )
                         SNAP_WINDOW_C_LEFT
                         break;
                       default:
-                        assert( false );
+                        abort();
                         break;
                       }
                     }
@@ -1611,9 +1610,8 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
 
 void Client::resizeWithChecks( int w, int h, ForceGeometry_t force )
     {
-    if( shade_geometry_change )
-        assert( false );
-    else if( isShade())
+    assert( !shade_geometry_change );
+    if( isShade())
         {
         if( h == border_top + border_bottom )
             {
@@ -2722,7 +2720,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
                 break;
             case PositionCenter:
             default:
-                assert( false );
+                abort();
                 break;
             }
 
@@ -2777,7 +2775,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
                 break;
             case PositionCenter:
             default:
-                assert( false );
+                abort();
                 break;
             }
         if( moveResizeGeom.size() != previousMoveResizeGeom.size())
@@ -2812,7 +2810,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             update = true;
         }
     else
-        assert( false );
+        abort();
 
     if( isResize())
         {
diff --git a/group.cpp b/group.cpp
index e44c140f71..51d634e6c6 100644
--- a/group.cpp
+++ b/group.cpp
@@ -175,7 +175,7 @@ static void checkTransiency()
             {
             kdDebug() << "BT:" << transiencyCheckStartBt << endl;
             kdDebug() << "CLIENT:" << transiencyCheckClient << endl;
-            assert( false );
+            abort();
             }
         transiencyCheckNonExistent = false;
         }
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 2b3cedbc5d..81305d2c8a 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -1019,7 +1019,7 @@ void SceneOpenGL::Texture::findTarget()
             mScale.setHeight( 1.0f );
           break;
         default:
-            assert( false );
+            abort();
         }
     }
 
diff --git a/workspace.cpp b/workspace.cpp
index 034cc810b9..6835af7b7c 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -2466,7 +2466,7 @@ void Workspace::helperDialog( const QString& message, const Client* c )
     if( message == "noborderaltf3" )
         {
         KAction* action = qobject_cast<KAction*>(keys->action( "Window Operations Menu" ));
-        if (action==0) assert( false );
+        assert( action != NULL );
         QString shortcut = QString( "%1 (%2)" ).arg( action->text() )
             .arg( action->globalShortcut().primary().toString());
         args << "--msgbox" <<
@@ -2480,7 +2480,7 @@ void Workspace::helperDialog( const QString& message, const Client* c )
     else if( message == "fullscreenaltf3" )
         {
         KAction* action = qobject_cast<KAction*>(keys->action( "Window Operations Menu" ));
-        if (action==0) assert( false );
+        assert( action != NULL );
         QString shortcut = QString( "%1 (%2)" ).arg( action->text() )
             .arg( action->globalShortcut().primary().toString());
         args << "--msgbox" <<
@@ -2493,7 +2493,7 @@ void Workspace::helperDialog( const QString& message, const Client* c )
         type = "altf3warning";
         }
     else
-        assert( false );
+        abort();
     if( !type.isEmpty())
         {
         KConfig cfg( "kwin_dialogsrc" );