Fix some minor shell.el oddness related to usage of error and message