diff --git a/src/i830_dri.c b/src/i830_dri.c
index 34e2336..a5863eb 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -419,10 +419,17 @@ I830DRI2DrawablePipe(DrawablePtr pDraw)
 {
 	ScreenPtr pScreen = pDraw->pScreen;
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	WindowPtr pWin = (WindowPtr)pDraw;
 	BoxRec box, crtcbox;
 	xf86CrtcPtr crtc;
 	int pipe = -1;
 
+	if (pDraw->type != DRAWABLE_WINDOW)
+		return -1;
+
+	if (pWin->redirectDraw != RedirectDrawNone)
+		return -1;
+
 	box.x1 = pDraw->x;
 	box.y1 = pDraw->y;
 	box.x2 = box.x1 + pDraw->width;