Rework error messages and other pull request issues