core: nicer error if shorthand can't be found
core: update error message for shorthand is bad