I created pull request https://github.com/NuGet/NuGetGallery/pull/1501 (into your branch) with my recommended implementation to address the error handling.