Added error handling for when unmarshalled type does not fit Map key