Include error.stack if the callback was called again with an Error.
Merge remote-tracking branch 'ajb/display-duplicate-callback-error'

* ajb/display-duplicate-callback-error:
  Include error.stack if the callback was called again with an Error.