diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index c5cb8d2..0935535 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2007.03.15.195534"
+#define Cdrskin_timestamP "2007.03.24.093238"
diff --git a/libburn/drive.c b/libburn/drive.c
index 5d0de12..a2fa83b 100644
--- a/libburn/drive.c
+++ b/libburn/drive.c
@@ -1458,10 +1458,12 @@ off_t burn_disc_available_space(struct burn_drive *d,
 		d->send_write_parameters(d, o);
 	d->get_nwa(d, -1, &lba, &nwa);
 ex:;
-	if (o->start_byte > 0) {
-		if (o->start_byte > d->media_capacity_remaining)
-			return 0;
-		return d->media_capacity_remaining - o->start_byte;
+	if (o != NULL) {
+		if (o->start_byte > 0) {
+			if (o->start_byte > d->media_capacity_remaining)
+				return 0;
+			return d->media_capacity_remaining - o->start_byte;
+		}
 	}
 	return d->media_capacity_remaining;
 }