handle tombstones and undefined manifest props

addresses #849 .