diff --git a/dix/devices.c b/dix/devices.c
index 5876ea459..679909611 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1034,8 +1034,7 @@ CloseDevice(DeviceIntPtr dev)
         }
     }
 
-    if (dev->deviceGrab.grab)
-        FreeGrab(dev->deviceGrab.grab);
+    FreeGrab(dev->deviceGrab.grab);
     free(dev->deviceGrab.sync.event);
     free(dev->config_info);     /* Allocated in xf86ActivateDevice. */
     free(dev->last.scroll);
diff --git a/dix/events.c b/dix/events.c
index 6b61a8c29..b7daf7f4b 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1510,8 +1510,7 @@ UpdateTouchesForGrab(DeviceIntPtr mouse)
             listener->window = grab->window;
             listener->state = TOUCH_LISTENER_IS_OWNER;
 
-            if (listener->grab)
-                FreeGrab(listener->grab);
+            FreeGrab(listener->grab);
             listener->grab = AllocGrab(grab);
         }
     }
@@ -1551,8 +1550,7 @@ UpdateGesturesForGrab(DeviceIntPtr mouse)
         listener->listener = grab->resource;
         listener->window = grab->window;
 
-        if (listener->grab)
-            FreeGrab(listener->grab);
+        FreeGrab(listener->grab);
         listener->grab = AllocGrab(grab);
     }
 }
@@ -1610,8 +1608,7 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
     UpdateGesturesForGrab(mouse);
     CheckGrabForSyncs(mouse, (Bool) grab->pointerMode,
                       (Bool) grab->keyboardMode);
-    if (oldgrab)
-        FreeGrab(oldgrab);
+    FreeGrab(oldgrab);
 }
 
 /**
@@ -1730,8 +1727,7 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
     grabinfo->implicitGrab = passive & ImplicitGrabMask;
     CheckGrabForSyncs(keybd, (Bool) grab->keyboardMode,
                       (Bool) grab->pointerMode);
-    if (oldgrab)
-        FreeGrab(oldgrab);
+    FreeGrab(oldgrab);
 }
 
 /**
diff --git a/dix/gestures.c b/dix/gestures.c
index ff9631460..bc4e2e475 100644
--- a/dix/gestures.c
+++ b/dix/gestures.c
@@ -114,10 +114,8 @@ void
 GestureEndGesture(GestureInfoPtr gi)
 {
     if (gi->has_listener) {
-        if (gi->listener.grab) {
-            FreeGrab(gi->listener.grab);
-            gi->listener.grab = NULL;
-        }
+        FreeGrab(gi->listener.grab);
+        gi->listener.grab = NULL;
         gi->listener.listener = 0;
         gi->has_listener = FALSE;
     }
diff --git a/dix/grabs.c b/dix/grabs.c
index 34d6458a5..5a85a2d56 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -257,7 +257,8 @@ CreateGrab(int client, DeviceIntPtr device, DeviceIntPtr modDevice,
 void
 FreeGrab(GrabPtr pGrab)
 {
-    BUG_RETURN(!pGrab);
+    if (!pGrab)
+        return;
 
     free(pGrab->modifiersDetail.pMask);
     free(pGrab->detail.pMask);