From 257f6b142f6e726dae1f767727e7255cbc2162b0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 3 Apr 2017 09:09:37 -0700
Subject: [PATCH 1/2] Add spec for remote setter not surfacing error

---
 spec/api-ipc-spec.js                     | 12 ++++++++++++
 spec/fixtures/module/error-properties.js | 11 +++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 spec/fixtures/module/error-properties.js

diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index 47f2eef2168..c5e38e83e4d 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -187,6 +187,18 @@ describe('ipc module', function () {
       property.property = 1127
     })
 
+    it('rethrows errors getting/setting properties', function () {
+      const foo = remote.require(path.join(fixtures, 'module', 'error-properties.js'))
+
+      assert.throws(function () {
+        foo.bar
+      }, /getting error/)
+
+      assert.throws(function () {
+        foo.bar = 'test'
+      }, /setting error/)
+    })
+
     it('can construct an object from its member', function () {
       var call = remote.require(path.join(fixtures, 'module', 'call.js'))
       var obj = new call.constructor()
diff --git a/spec/fixtures/module/error-properties.js b/spec/fixtures/module/error-properties.js
new file mode 100644
index 00000000000..c3a1e3b3a7f
--- /dev/null
+++ b/spec/fixtures/module/error-properties.js
@@ -0,0 +1,11 @@
+class Foo {
+  set bar (value) {
+    throw new Error('setting error')
+  }
+
+  get bar () {
+    throw new Error('getting error')
+  }
+}
+
+module.exports = new Foo()

From e85e483c710097a2bf890e52e398044a6d9c1673 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 3 Apr 2017 09:11:06 -0700
Subject: [PATCH 2/2]  Parse setting response to surface thrown errors

---
 lib/renderer/api/remote.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index b3d3d2ab17c..f65d61790ac 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -139,7 +139,12 @@ const setObjectMembers = function (ref, object, metaId, members) {
       // Only set setter when it is writable.
       if (member.writable) {
         descriptor.set = function (value) {
-          ipcRenderer.sendSync('ELECTRON_BROWSER_MEMBER_SET', metaId, member.name, value)
+          const meta = ipcRenderer.sendSync('ELECTRON_BROWSER_MEMBER_SET', metaId, member.name, value)
+          // Meta will be non-null when a setter error occurred so parse it
+          // to a value so it gets re-thrown.
+          if (meta != null) {
+            metaToValue(meta)
+          }
           return value
         }
       }