Better exception messages after FetchMetadata call + minor cleanup