Improve error handling when database connection is lost.
More improvements to error handling when database connection is lost.
Merge remote-tracking branch 'integration/VLER-DAS-4.4.1' into VLER-DAS-4.4.1