Fail gracefully for thumbnail count mismatch
Fixups