refs #6998 improve data check before processing deletion