remove if checks in cases where delete handles null
Merge pull request #2191 from birarda/null-checks

more null pointer cleanup