some db error handling
Merge branch 'release/4.1.58'