diff --git a/src/ops.c b/src/ops.c
index d2060a4..66b9b59 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -6240,7 +6240,9 @@
     regname = may_get_selection(regname);
 #endif
 
-    /* Should we check for a valid name? */
+    if (regname != NUL && !valid_yank_reg(regname, FALSE))
+        return MAUTO;
+
     get_yank_register(regname, FALSE);
 
     if (y_current->y_array != NULL)