diff --git a/common/content/events.js b/common/content/events.js
index 263d81a9..e82efa95 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -530,8 +530,7 @@ var Events = Module("events", {
      */
     playMacro: function (macro) {
         let res = false;
-        dactyl.assert(!/[a-zA-Z0-9@]/.test(macro) && macro.length == 1,
-                      _("macro.invalid", macro));
+        dactyl.assert(/^[a-zA-Z0-9@]$/.test(macro), _("macro.invalid", macro));
 
         if (macro == "@")
             dactyl.assert(this._lastMacro, _("macro.noPrevious"));
diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties
index 25a0fb0c..d7dee3a7 100644
--- a/common/locale/en-US/messages.properties
+++ b/common/locale/en-US/messages.properties
@@ -53,6 +53,7 @@ macro.loadWaiting = Waiting for page to load...
 macro.noSuch- = Macro '%S' not set
 macro.noPrevious = No previous macro
 macro.invalid- = Invalid macro name: '%S'
+macro.notSet- = Exxx: Register '%S' not set
 
 map.builtinImmutable = Cannot change mappings in the builtin group
 map.none = No mapping found