Making exceptions more visible
Added debug information for map