Revert "Revert "MapComparator""

This reverts commit fb265ee263a6ad5f1338ba8d8b26015cdd173184.
trap over a failing decode