Fixed deserialization of unparseable exceptions
Merge remote-tracking branch 'origin/master'