am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit

* commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
  Defend against missing DB during migration.