diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 2b9e4f9..1c55139 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2011.03.18.153326"
+#define Cdrskin_timestamP "2011.03.19.222152"
diff --git a/libburn/sector.c b/libburn/sector.c
index 32b4a9a..0bba551 100644
--- a/libburn/sector.c
+++ b/libburn/sector.c
@@ -182,7 +182,8 @@ static void get_bytes(struct burn_track *track, int count, unsigned char *data)
 	/* ts A61031 - B10103 */
 	if (shortage >= count)
 		track->track_data_done = 1;
-	if (track->end_on_premature_eoi && !track->open_ended) {
+	if (track->end_on_premature_eoi && shortage >= count &&
+	    !track->open_ended) {
 		char msg[80];
 		/* Memorize that premature end of input happened */
 		sprintf(msg,