additional error handling
additional error handling
cleanup debug print statements
Merge pull request #1019 from achamely/master

Additional Error handling for db modules