Merge "DatabaseCorruptionHandler causes NPE"