Bugfix for issue3885 and 'DB.verify()' crash.

Reviewed by Nick Coghlan.
3 files changed