diff --git a/src/registry.py b/src/registry.py
index 02289357a..5bd5b09b1 100644
--- a/src/registry.py
+++ b/src/registry.py
@@ -539,7 +539,10 @@ class Regexp(Value):
         self.__parent.__init__(*args, **kwargs)
 
     def error(self, e):
-        self.__parent.error('Value must be a regexp of the form %s' % e)
+        s = 'Value must be a regexp of the form m/.../ or /.../. %s' % e
+        e = InvalidRegistryValue(s)
+        e.value = self
+        raise e
 
     def set(self, s):
         try: