diff --git a/src/mouse.c b/src/mouse.c
index 53675e9..e2e2a13 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -21,8 +21,6 @@
 #include "main.h"
 #include "surface.h"
 
-#define MAX_HOOKS 16
-
 BOOL mouse_active = FALSE;
 int yAdjust = 0;
 
diff --git a/src/surface.c b/src/surface.c
index 3f5e4d5..d36b276 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -102,7 +102,7 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR
     }
 #endif
 
-    if (dwFlags & DDBLT_COLORFILL)
+    if (This->surface && (dwFlags & DDBLT_COLORFILL))
     {
         int dst_w = lpDestRect->right - lpDestRect->left;
         int dst_h = lpDestRect->bottom - lpDestRect->top;