More robust handling of failure cases.
Merge pull request #111 from hawesie/hydro-release

More robust handling of failure cases.