Improve some error messages, should help resolve some issues