Update multi-line comment style.
Improve error handling logic and message wording.