Changes to implement better error handling
Merge branch 'master' of https://github.com/gminaker/databases