errorClass: Further protect against nil errorMap.  Fixes #285
Merge remote-tracking branch 'upstream/master'