Re #924 - Fixing changes to be able to handle damaged mongo records...