Preventing unbound variable on dispatch

After we changed to strict variables, the $2 argument on dispatch
started to present some errors in libraries that imported our
lib/common.sh due to the set -euf options. This commit fixes that.