Give a sensible error message if the user enters broken JSON (or more likely, the shell eats it for them).
Merge bug25401
stable to default