Ensure Invalid JSON and errors during deletes are displayed correctly

Change-Id: Iccd4ee10611cfa58a98618f29545d5b194edafa3