Improved on style for error messages (too long lines in source code originally.)