Return error in json

Test: th
Change-Id: Ie9ef8e2bac6447bdc1bf40dcb2b5731b57b47f77
2 files changed