diff --git a/coordinator/coordinator.go b/coordinator/coordinator.go
index f675292..62590b0 100644
--- a/coordinator/coordinator.go
+++ b/coordinator/coordinator.go
@@ -445,6 +445,9 @@ func (c *coordinator) MakeSpaceUnshareable(ctx context.Context, spaceId, aclHead
 	}
 
 	err = c.spaceStatus.MakeUnshareable(ctx, spaceId)
+	if err != nil {
+		return
+	}
 
 	return c.aclEventLog.AddLog(ctx, acleventlog.AclEventLogEntry{
 		SpaceId:   spaceId,
diff --git a/coordinator/rpchandler.go b/coordinator/rpchandler.go
index d6165ba..82ae513 100644
--- a/coordinator/rpchandler.go
+++ b/coordinator/rpchandler.go
@@ -450,13 +450,6 @@ func (r *rpcHandler) AclEventLog(ctx context.Context, req *coordinatorproto.AclE
 			Type:      t,
 		})
 
-		// add additional fields for some record types
-
-		// TODO: copy SignedSpaceReceipt field, protos does not have it yet
-		// if rec.EntryType == acleventlog.EntryTypeSpaceReceipt {
-		//	resp.Records[len(resp.Records)-1].SignedSpaceReceipt = rec.SignedSpaceReceipt
-		// }
-
 		if rec.EntryType == acleventlog.EntryTypeSpaceAclAddRecord {
 			resp.Records[len(resp.Records)-1].AclChangeId = rec.AclChangeId
 		}