diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c
index 9cadc705..9c96453f 100644
--- a/xorriso/iso_img.c
+++ b/xorriso/iso_img.c
@@ -681,29 +681,26 @@ no_image:;
    }
    if(!(is_default && no_defaults))
       Xorriso_status_result(xorriso,filter,fp,flag&2); 
-   ret= 1; goto after_el_torito;
+   goto report_open_item;
  }
 
-
  if(xorriso->boot_image_bin_path[0] || xorriso->boot_count > 0)
    bin_path_in_use= 1;
- if(xorriso->boot_image_cat_path[0] && bin_path_in_use) {
-   is_default= 0;
-   sprintf(line,"-boot_image %s cat_path=", form);
-   Text_shellsafe(xorriso->boot_image_cat_path, line, 1);
-   strcat(line, "\n");
-   if(!(is_default && no_defaults))
-     Xorriso_status_result(xorriso,filter,fp,flag&2);
- }
- if(bin_path_in_use) {
-   is_default= !xorriso->boot_image_cat_hidden;
-   hpt= Xorriso__hide_mode_text(xorriso->boot_image_cat_hidden & 63, 0);
-   if(hpt != NULL)
-     sprintf(line, "-boot_image %s cat_hidden=%s\n", form, hpt);
-   Xorriso_free_meM(hpt);
-   if(!(is_default && no_defaults))
-     Xorriso_status_result(xorriso,filter,fp,flag&2);
- }
+
+ is_default= (xorriso->boot_image_cat_path[0] == 0);
+ sprintf(line,"-boot_image %s cat_path=", form);
+ Text_shellsafe(xorriso->boot_image_cat_path, line, 1);
+ strcat(line, "\n");
+ if(!(is_default && no_defaults))
+   Xorriso_status_result(xorriso,filter,fp,flag&2);
+
+ is_default= !xorriso->boot_image_cat_hidden;
+ hpt= Xorriso__hide_mode_text(xorriso->boot_image_cat_hidden & 63, 0);
+ if(hpt != NULL)
+   sprintf(line, "-boot_image %s cat_hidden=%s\n", form, hpt);
+ Xorriso_free_meM(hpt);
+ if(!(is_default && no_defaults))
+   Xorriso_status_result(xorriso,filter,fp,flag&2);
 
  if(xorriso->boot_count > 0) {
 
@@ -761,7 +758,8 @@ no_image:;
    if(i >= 28)
      {ret= 1; goto ex;} /* Images registered, pending is still default */
  }
-  
+
+report_open_item:;
  hflag= 16; 
  if(xorriso->boot_platform_id == 0xef && !xorriso->boot_efi_default)
    hflag= 0;
@@ -774,7 +772,6 @@ no_image:;
  if(ret <= 0)
    goto ex;
 
-after_el_torito:;
  ret = Xorriso_append_part_status(xorriso, image, filter, fp, flag & 3);
  if(ret <= 0)
    goto ex;
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 0e017a50..7ca00d3b 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2014.02.27.091053"
+#define Xorriso_timestamP "2014.03.02.102010"