diff --git a/src/github.com/matrix-org/dendrite/clientapi/threepid/invites.go b/src/github.com/matrix-org/dendrite/clientapi/threepid/invites.go
index 339999ad9..6ab8f9135 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/threepid/invites.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/threepid/invites.go
@@ -63,8 +63,12 @@ type idServerStoreInviteResponse struct {
 }
 
 var (
+	// ErrMissingParameter is the error raised if a request for 3PID invite has
+	// an incomplete body
 	ErrMissingParameter = errors.New("'address', 'id_server' and 'medium' must all be supplied")
-	ErrNotTrusted       = errors.New("Untrusted server")
+	// ErrNotTrusted is the error raised if an identity server isn't in the list
+	// of trusted servers in the configuration file.
+	ErrNotTrusted = errors.New("untrusted server")
 )
 
 // CheckAndProcessInvite analyses the body of an incoming membership request.
diff --git a/src/github.com/matrix-org/dendrite/clientapi/writers/membership.go b/src/github.com/matrix-org/dendrite/clientapi/writers/membership.go
index 7a1ad10bb..4295522ec 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/writers/membership.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/writers/membership.go
@@ -33,7 +33,7 @@ import (
 	"github.com/matrix-org/util"
 )
 
-var errMissingUserID = errors.New("'user_id' must be supplied.")
+var errMissingUserID = errors.New("'user_id' must be supplied")
 
 // SendMembership implements PUT /rooms/{roomID}/(join|kick|ban|unban|leave|invite)
 // by building a m.room.member event then sending it to the room server