diff --git a/src/video/wincommon/SDL_lowvideo.h b/src/video/wincommon/SDL_lowvideo.h
index 83bed364e..a78441e57 100644
--- a/src/video/wincommon/SDL_lowvideo.h
+++ b/src/video/wincommon/SDL_lowvideo.h
@@ -37,12 +37,14 @@ static char rcsid =
 
 #define WINDIB_FULLSCREEN()						\
 (									\
+	SDL_VideoSurface &&						\
 	((SDL_VideoSurface->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN) && \
 	(((SDL_VideoSurface->flags & SDL_OPENGL   ) == SDL_OPENGL    ) || \
 	 (strcmp(this->name, "windib") == 0))				\
 )
 #define DDRAW_FULLSCREEN() 						\
 (									\
+	SDL_VideoSurface &&						\
 	((SDL_VideoSurface->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN) && \
 	((SDL_VideoSurface->flags & SDL_OPENGL    ) != SDL_OPENGL    ) && \
 	(strcmp(this->name, "directx") == 0)				\
diff --git a/src/video/wincommon/SDL_sysevents.c b/src/video/wincommon/SDL_sysevents.c
index b2b30350d..459817bab 100644
--- a/src/video/wincommon/SDL_sysevents.c
+++ b/src/video/wincommon/SDL_sysevents.c
@@ -190,10 +190,6 @@ LONG CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			BOOL minimized;
 			Uint8 appstate;
 
-			if ( ! this->screen ) {
-				/* What do we do when we get the screen? */
-				return(0);
-			}
 			minimized = HIWORD(wParam);
 			if ( !minimized && (LOWORD(wParam) != WA_INACTIVE) ) {
 				/* Gain the following states */