Modified delete to throw the exception and allow the caller to handle it

Change-Id: I70ac41de74696e735b0c498d43715e97d46e92ca