Fix bug 9645: don't forget an md just because we can't save it.
Merge remote-tracking branch 'public/bug9645' into maint-0.2.4