diff --git a/ChangeLog b/ChangeLog
index 90a899218..7996c26d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-26 Julien Blache <jb@jblache.org>
+	* backend/genesys.c: add missing check when logging raw data,
+	patch by Tollef Fog Heen <tfheen@err.no>.
+
 2009-09-16  Nicolas Martin <nicols-guest at users.alioth.debian.org>
 	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, 
 	doc/sane-pixma.man:
diff --git a/backend/genesys.c b/backend/genesys.c
index 1eb073ede..102797ff5 100644
--- a/backend/genesys.c
+++ b/backend/genesys.c
@@ -4434,8 +4434,11 @@ genesys_read_ordered_data (Genesys_Device * dev, SANE_Byte * destination,
 	   "genesys_read_ordered_data: nothing more to scan: EOF\n");
       *len = 0;
 #ifdef SANE_DEBUG_LOG_RAW_DATA
-      fclose (rawfile);
-      rawfile = NULL;
+      if (rawfile != NULL)
+	{
+	  fclose (rawfile);
+	  rawfile = NULL;
+	}
 #endif
       return SANE_STATUS_EOF;
     }