"TypeError: 'str' object does not support item deletion" on handling EP v2 errors

Change-Id: Ifccf5f2800ac47f6e3822e209daa9d81e912e08c