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

More robust handling of failure cases.