A quick fix to ensure that json.Marshal returns errors correctly, as well as some error-related tests

R=rsc
https://golang.org/cl/157151