Improve error message & starting locations