diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c
index 634b644a..39b28a72 100644
--- a/xorriso/lib_mgt.c
+++ b/xorriso/lib_mgt.c
@@ -487,7 +487,10 @@ int Xorriso_set_local_charset(struct XorrisO *xorriso, char *name, int flag)
 cannot:;
    sprintf(xorriso->info_text,
            "-local_charset: Cannot assume as local character set: ");
-   Text_shellsafe(name, xorriso->info_text, 1);
+   if(name != NULL)
+     Text_shellsafe(name, xorriso->info_text, 1);
+   else
+     Text_shellsafe("(NULL-pointer)", xorriso->info_text, 1);
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
    return(0);
  }
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 41ab77e9..21d5fc4a 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2015.11.15.153822"
+#define Xorriso_timestamP "2015.11.16.100618"