diff --git a/apps/dgst.c b/apps/dgst.c
index d471dbdabda49e244f5ad13be5a059731fb46b44..19c9424be24007f316cb44a014f7b2790cac1535 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -529,7 +529,8 @@ int MAIN(int argc, char **argv)
 					EVP_PKEY_asn1_get0_info(NULL, NULL,
 						NULL, NULL, &sig_name, ameth);
 				}
-			md_name = EVP_MD_name(md);
+			if (md)
+				md_name = EVP_MD_name(md);
 			}
 		err = 0;
 		for (i=0; i<argc; i++)
@@ -641,7 +642,12 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 	else 
 		{
 		if (sig_name)
-			BIO_printf(out, "%s-%s(%s)= ", sig_name, md_name, file);
+			{
+			BIO_puts(out, sig_name);
+			if (md_name)
+				BIO_printf(out, "-%s", md_name);
+			BIO_printf(out, "(%s)= ", file);
+			}
 		else if (md_name)
 			BIO_printf(out, "%s(%s)= ", md_name, file);
 		else