diff --git a/S05-substitution/match.t b/S05-substitution/match.t
index 706ee7a2e1..3e4c0ef88d 100644
--- a/S05-substitution/match.t
+++ b/S05-substitution/match.t
@@ -2,7 +2,7 @@ use v6;
 
 use Test;
 
-plan 18;
+plan 19;
 
 # L<S05/Substitution/>
 
@@ -48,4 +48,7 @@ is $m[0], 'oo',             'match object indexes as an array';
         (for 1..10 { 'st' x $_ ~ 'Z' }), 'can .subst: /:i T/, "Z"';
 }
 
+throws-like { "".match: Nil }, X::Multi::NoMatch,
+    '.match with Nil matcher does not hang';
+
 # vim: ft=perl6