Make sure the filicide is justified
Merge pull request #1127 from pmenglund/nil_kill

Make sure the filicide is justified