Fixed problem in DeleteEdit and added some null checking.
Refs #2473

Change-Id: I9e5b60a9bf5927d45db1d0d35781bdff0a8ba9e7