Wrapped Plan delete with message on IntegrityError.

Identical to Gerrit Id919f065de9b8da917d97437512d5fb034707bfb