Fixed some map display errors, improved error message