change exception handling on delete