diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index 97516018e..acf82eb2f 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -939,7 +939,7 @@ let%expect_test _ =
 
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; contract "bad_address_format.religo" ; "main" ] ;
-  [%expect {| ligo: in file "bad_address_format.religo", line 2, characters 25-47. Badly formatted address "KT1badaddr":  {"location":"in file \"bad_address_format.religo\", line 2, characters 25-47"} |}]
+  [%expect {| ligo: in file "bad_address_format.religo", line 2, characters 25-47. Badly formatted literal: address "KT1badaddr" {"location":"in file \"bad_address_format.religo\", line 2, characters 25-47"} |}]
 
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; contract "bad_timestamp.ligo" ; "main" ] ;
diff --git a/src/passes/3-self_ast_simplified/literals.ml b/src/passes/3-self_ast_simplified/literals.ml
index dfe3cac4a..c2694ed28 100644
--- a/src/passes/3-self_ast_simplified/literals.ml
+++ b/src/passes/3-self_ast_simplified/literals.ml
@@ -3,23 +3,32 @@ open Trace
 open Proto_alpha_utils
 
 module Errors = struct
-  let bad_literal_address s_addr loc () =
-    let title = (thunk ("Badly formatted address \""^s_addr^"\"")) in
-    let message () = "" in
+
+  let bad_format e () =
+    let title = (thunk ("Badly formatted literal")) in
+    let message () = Format.asprintf "%a" Ast_simplified.PP.expression e in
     let data = [
-      ("location" , fun () -> Format.asprintf "%a" Location.pp loc)
+      ("location" , fun () -> Format.asprintf "%a" Location.pp e.location)
     ] in
     error ~data title message ()
+
 end
 open Errors
 
 let peephole_expression : expression -> expression result = fun e ->
   let return expression = ok { e with expression } in
   match e.expression with
+  | E_literal (Literal_key_hash s) as l -> (
+    let open Tezos_crypto in
+    let%bind (_pkh:Crypto.Signature.public_key_hash) =
+      Trace.trace_tzresult (bad_format e) @@
+      Signature.Public_key_hash.of_b58check s in
+    return l
+    )
   | E_literal (Literal_address s) as l -> (
     let open Memory_proto_alpha in
     let%bind (_contract:Protocol.Alpha_context.Contract.t) = 
-      Trace.trace_alpha_tzresult (bad_literal_address s e.location) @@
+      Trace.trace_alpha_tzresult (bad_format e) @@
       Protocol.Alpha_context.Contract.of_b58check s in
     return l
     )
diff --git a/src/stages/common/PP.ml b/src/stages/common/PP.ml
index dbcc3c43f..74dd5b78b 100644
--- a/src/stages/common/PP.ml
+++ b/src/stages/common/PP.ml
@@ -190,12 +190,12 @@ let literal ppf (l:literal) = match l with
   | Literal_mutez n -> fprintf ppf "%dmutez" n
   | Literal_string s -> fprintf ppf "%S" s
   | Literal_bytes b -> fprintf ppf "0x%a" Hex.pp (Hex.of_bytes b)
-  | Literal_address s -> fprintf ppf "@%S" s
+  | Literal_address s -> fprintf ppf "address %S" s
   | Literal_operation _ -> fprintf ppf "Operation(...bytes)"
   | Literal_key s      -> fprintf ppf "key %s" s
   | Literal_key_hash s -> fprintf ppf "key_hash %s" s
-  | Literal_signature s -> fprintf ppf "Signature %s" s
-  | Literal_chain_id s -> fprintf ppf "Chain_id %s" s
+  | Literal_signature s -> fprintf ppf "signature %s" s
+  | Literal_chain_id s -> fprintf ppf "chain_id %s" s
 
 let%expect_test _ =
   Format.printf "%a" literal (Literal_bytes (Bytes.of_string "foo")) ;