Patched holes in SoftDelete that were causing null reference errors.
Fixes #3892