Upstream

more verbose error handling