Add more validation when deleting