=== modified file 'common.zsh'
--- common.zsh	2017-12-12 10:28:43 +0000
+++ common.zsh	2017-12-12 10:18:49 +0000
@@ -32,13 +32,13 @@
 	local base
 	base=${BASE##*/}
 	[[ -z $base || $base == '%' ]] && return
-	tr <<<$base _- /+ | base64 -d
+	tr <<<$base _- /+ | base64 -d \
+		|| die "Unable to decode: ${(qqq)base}"
 }
 decode_args() {
 	typeset -gA vars
 	local arg decoded
-	decoded=$(decode_argstr) \
-		|| die "Unable to decode: ${(qqq)${BASE##*/}}"
+	decoded=$(decode_argstr)
 	(($#decoded)) || return
 	for arg in "${(s::Q)decoded}"; do
 		if [[ "$arg" != *=* ]]; then