Improved error reporting; first attempt to handle map crs