Slightly smarter error handling
Merge branch 'develop' of https://github.com/icereval/waterbutler into develop