1 files changed, 6 insertions, 0 deletions
diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp
index 675b10fcd..809ae4649 100644
--- a/src/guichan/include/guichan/sdl/sdlpixel.hpp
+++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp
@@ -60,6 +60,9 @@ namespace gcn
      */
     inline const Color SDLgetPixel(SDL_Surface* surface, int x, int y)
     {
+        if (!surface)
+            return Color(0, 0, 0, 0);
+
         int bpp = surface->format->BytesPerPixel;
 
         SDL_LockSurface(surface);
@@ -112,6 +115,9 @@ namespace gcn
     inline void SDLputPixel(SDL_Surface* surface, int x, int y,
                             const Color& color)
     {
+        if (!surface)
+            return;
+
         int bpp = surface->format->BytesPerPixel;
 
         SDL_LockSurface(surface);