diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c
index 5d7d133e..3cd572fe 100644
--- a/xorriso/parse_exec.c
+++ b/xorriso/parse_exec.c
@@ -226,7 +226,7 @@ int Xorriso_set_problem_status(struct XorrisO *xorriso, char *severity,
  static int complaints= 0, complaint_limit= 5;
 #endif
 
- if(severity[0])
+ if(severity[0] && strlen(severity) < sizeof(xorriso->problem_status_text))
    sev_text= severity;
  ret= Xorriso__text_to_sev(sev_text, &sev, 0);
  if(ret<=0)
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 1d2203a5..bcda72bf 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2015.11.04.110102"
+#define Xorriso_timestamP "2015.11.04.114353"