1 files changed, 4 insertions, 2 deletions

diff --git a/src/search.c b/src/search.c
index 24f21f053a5..ec83065bbc3 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2622,8 +2622,10 @@ match_limit (num, beginningp)
 
   CHECK_NUMBER (num);
   n = XINT (num);
-  if (n < 0 || search_regs.num_regs <= 0)
-    args_out_of_range (num, make_number (search_regs.num_regs));
+  if (n < 0)
+    args_out_of_range (num, 0);
+  if (search_regs.num_regs <= 0)
+    error ("No match data, because no search succeeded");
   if (n >= search_regs.num_regs
       || search_regs.start[n] < 0)
     return Qnil;