diff --git a/xorriso/write_run.c b/xorriso/write_run.c
index 8cb27b8c..4327f8c0 100644
--- a/xorriso/write_run.c
+++ b/xorriso/write_run.c
@@ -616,7 +616,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
  struct burn_drive_info *dinfo, *source_dinfo;
  struct burn_drive *drive, *source_drive;
  struct burn_disc *disc= NULL;
- struct burn_write_opts *burn_options;
+ struct burn_write_opts *burn_options= NULL;
  off_t readcounter= 0,writecounter= 0;
  int num_sessions= 0, num_tracks= 0;
  struct burn_session **sessions;
@@ -1013,6 +1013,7 @@ fprintf(stderr, "XORRISO_DEBUG: isoburn_igopt_set_tail_blocks(%d)\n",
  xorriso->run_state= 1; /* Indicate that burning has started */
  isoburn_disc_write(burn_options, disc);
  burn_write_opts_free(burn_options);
+ burn_options= NULL;
 
  ret= Xorriso_pacifier_loop(xorriso, drive, pacifier_speed << 4);
  if(burn_is_aborting(0))
@@ -1077,6 +1078,8 @@ ex:;
  if(image != NULL)
    iso_image_unref(image);
  isoburn_igopt_destroy(&sopts, 0);
+ if(burn_options != NULL)
+   burn_write_opts_free(burn_options);
  Xorriso_process_msg_queues(xorriso,0);
  Xorriso_append_scdbackup_record(xorriso, 0);
  Xorriso_free_meM(sfe);
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index ecd16672..4d45d932 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.05.31.071033"
+#define Xorriso_timestamP "2012.06.05.103058"