More none checking changes.
Merge pull request #118 from hawesie/hydro-release

More none checking changes.