diff --git a/src/client.js b/src/client.js
index a1ba21209..d819e4fbf 100644
--- a/src/client.js
+++ b/src/client.js
@@ -937,6 +937,7 @@ function _sendEvent(client, room, event, callback) {
 
         try {
             _updatePendingEventStatus(room, event, EventStatus.NOT_SENT);
+            event.error = err;
 
             if (callback) {
                 callback(err);
diff --git a/src/models/event.js b/src/models/event.js
index 0da0da745..fb4e51068 100644
--- a/src/models/event.js
+++ b/src/models/event.js
@@ -65,6 +65,7 @@ module.exports.EventStatus = {
  * @prop {RoomMember} target The room member who is the target of this event, e.g.
  * the invitee, the person being banned, etc.
  * @prop {EventStatus} status The sending status of the event.
+ * @prop {Error} error most recent error associated with sending the event, if any
  * @prop {boolean} forwardLooking True if this event is 'forward looking', meaning
  * that getDirectionalContent() will return event.content and not event.prev_content.
  * Default: true. <strong>This property is experimental and may change.</strong>
@@ -76,6 +77,7 @@ module.exports.MatrixEvent = function MatrixEvent(
     this.sender = null;
     this.target = null;
     this.status = null;
+    this.error = null;
     this.forwardLooking = true;
     this._pushActions = null;
     this._date = this.event.origin_server_ts ?