Remove stash handling when other errors are the problem

This interferes with getting the correct error message, which makes it
nearly impossible to help debug problems...

Change-Id: Ib04b897bc912065aaa4900f7904fe724ffec5385
Merge "Remove stash handling when other errors are the problem"