Checking for is not None explicitly. Sorry @lucab-eyer.
Merge pull request #14 from hawesie/hydro-devel

Checking for is not None explicitly. Sorry @lucab-eyer.