Update exception messages, align method names, extract methods Original Pull Request: #2488
repository
aot