diff --git a/xorriso/text_io.c b/xorriso/text_io.c
index 2a92e055..f8aff6bb 100644
--- a/xorriso/text_io.c
+++ b/xorriso/text_io.c
@@ -1443,10 +1443,10 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
  if(!(is_default && no_defaults))
    Xorriso_status_result(xorriso, filter, fp, flag & 2);
 
- if(strncmp(filter, "-cdi", 4) == 0)
-   sprintf(line,"-cdi ");
- else
    sprintf(line,"-cd ");
+ if(filter != NULL)
+   if(strncmp(filter, "-cdi", 4) == 0)
+     sprintf(line,"-cdi ");
  sprintf(line + strlen(line),"%s\n",
          (xorriso->wdi[0] ? Text_shellsafe(xorriso->wdi,sfe,0) : "'/'"));
  Xorriso_status_result(xorriso,filter,fp,flag&2);
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index d4763693..8ff12548 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.08.20.084354"
+#define Xorriso_timestamP "2012.09.08.082759"