Please disregard my previous patch and instead attaching updated patch.
In my previous patch I used `let` keyword instead of `var` for defining variable, for consistency & backward compatibility I have used `var` in my latest patch.
That seems like an odd way to fix this - we put in ***** Error ***** in the backend, then remove it in the front end.
I think it would be better to ensure it's formatted sensibly at the backed to begin with.
