match some json exception stuff from master