Index: b/tools/gpgsm-gencert.sh
===================================================================
--- b/tools/gpgsm-gencert.sh
+++ b/tools/gpgsm-gencert.sh
@@ -178,10 +178,10 @@
 Key-Usage: $KEY_USAGE
 Name-DN: $NAME
 EOF
-[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP"
-[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES"
-[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES"
-[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES"
+[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" || true
+[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" || true
+[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" || true
+[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" || true
 ) > "$file_parameter"