1 files changed, 4 insertions, 1 deletions
diff --git a/g10/g10.c b/g10/g10.c
index 5dff5768a..60a6aaef4 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1658,7 +1658,10 @@ main( int argc, char **argv )
 	    break;
 	  case oSigKeyserverURL: add_keyserver_url(pargs.r.ret_str,0); break;
 	  case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break;
-	  case oComment: add_to_strlist(&opt.comments,pargs.r.ret_str); break;
+	  case oComment:
+	    if(pargs.r.ret_str[0])
+	      add_to_strlist(&opt.comments,pargs.r.ret_str);
+	    break;
 	  case oDefaultComment:
 	    deprecated_warning(configname,configlineno,
 			       "--default-comment","--no-comments","");