Minor mods to messages and error handling.