try/catch consistency, and also 4-space indentation.
Second time lucky.
Merge pull request #522 from aodn/catch_consistency

try/catch consistency, and also 4-space indentation.