diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a26390237..730d244654 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ These are only breaking changes for unformatted code.
 - Process `@set` annotation for field update as generating an uncurried function https://github.com/rescript-lang/rescript-compiler/pull/5846
 - Treat uncurried application of primitives like curried application, which produces better output https://github.com/rescript-lang/rescript-compiler/pull/5851
 - New internal representation for uncurried functions using built-in type `function$<fun_type, arity>` this avoids having to declare all the possible arities ahead of time https://github.com/rescript-lang/rescript-compiler/pull/5870
+- Better error message for extension point https://github.com/rescript-lang/rescript-compiler/pull/5965
 
 # 10.1.1
 
diff --git a/jscomp/frontend/ast_exp_handle_external.ml b/jscomp/frontend/ast_exp_handle_external.ml
index e6a711c17e..64401594bd 100644
--- a/jscomp/frontend/ast_exp_handle_external.ml
+++ b/jscomp/frontend/ast_exp_handle_external.ml
@@ -69,12 +69,16 @@ let handle_debugger loc (payload : Ast_payload.t) =
       Ast_external_mk.local_external_apply loc ~pval_prim:[ "#debugger" ]
         ~pval_type:(Typ.arrow Nolabel (Typ.any ()) (Ast_literal.type_unit ()))
         [ Ast_literal.val_unit ~loc () ]
-  | _ -> Location.raise_errorf ~loc "bs.debugger does not accept payload"
+  | _ -> Location.raise_errorf ~loc "%%debugger extension doesn't accept arguments"
 
 let handle_raw ~kind loc payload =
   let is_function = ref false in
   match Ast_payload.raw_as_string_exp_exn ~kind ~is_function payload with
-  | None -> Location.raise_errorf ~loc "bs.raw can only be applied to a string"
+  | None ->
+    (match kind with
+    | Raw_re -> Location.raise_errorf ~loc "%%re extension can only be applied to a string"
+    | Raw_exp -> Location.raise_errorf ~loc "%%raw extension can only be applied to a string"
+    | Raw_program -> Location.raise_errorf ~loc "%%%%raw extension can only be applied to a string")
   | Some exp ->
       {
         exp with
@@ -99,4 +103,4 @@ let handle_raw_structure loc payload =
               ~pval_type:(Typ.arrow Nolabel (Typ.any ()) (Typ.any ()))
               [ exp ];
         }
-  | None -> Location.raise_errorf ~loc "bs.raw can only be applied to a string"
+  | None -> Location.raise_errorf ~loc "%%%%raw extension can only be applied to a string"