From 372ff70906603078f571e8545cbda964d60b373a Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 14 Aug 2020 16:55:54 +0100
Subject: [PATCH] Fix error passing

---
 roomserver/api/perform.go | 2 +-
 roomserver/api/wrapper.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roomserver/api/perform.go b/roomserver/api/perform.go
index d7f72a997..24e958bb4 100644
--- a/roomserver/api/perform.go
+++ b/roomserver/api/perform.go
@@ -105,7 +105,7 @@ type PerformInviteRequest struct {
 }
 
 type PerformInviteResponse struct {
-	Error *PerformError `json:"error"`
+	Error *PerformError
 }
 
 // PerformBackfillRequest is a request to PerformBackfill.
diff --git a/roomserver/api/wrapper.go b/roomserver/api/wrapper.go
index d110bfc5d..ed3daf67e 100644
--- a/roomserver/api/wrapper.go
+++ b/roomserver/api/wrapper.go
@@ -112,11 +112,11 @@ func SendInvite(
 	}
 	response := &PerformInviteResponse{}
 	if err := rsAPI.PerformInvite(ctx, request, response); err != nil {
-		if response.Error != nil {
-			return response.Error
-		}
 		return fmt.Errorf("rsAPI.PerformInvite: %w", err)
 	}
+	if response.Error != nil {
+		return response.Error
+	}
 
 	// Now send the invite event into the roomserver. If the room is known
 	// locally then this will succeed, notifying existing users in the room