Updated error messages to be more consistent in code and batch files.