diff --git a/api/types/accesslist/convert/v1/accesslist.go b/api/types/accesslist/convert/v1/accesslist.go
index b274d2b0d429c..e652d5a4632c3 100644
--- a/api/types/accesslist/convert/v1/accesslist.go
+++ b/api/types/accesslist/convert/v1/accesslist.go
@@ -83,12 +83,15 @@ func FromProto(msg *accesslistv1.AccessList, opts ...AccessListOption) (*accessl
 			Traits: traitv1.FromProto(msg.Spec.Grants.Traits),
 		},
 	})
+	if err != nil {
+		return nil, trace.Wrap(err)
+	}
 
 	for _, opt := range opts {
 		opt(accessList)
 	}
 
-	return accessList, trace.Wrap(err)
+	return accessList, nil
 }
 
 // ToProto converts an internal access list into a v1 access list object.
diff --git a/api/types/accesslist/convert/v1/member.go b/api/types/accesslist/convert/v1/member.go
index 6ddca300a3322..b4dd495ea79c3 100644
--- a/api/types/accesslist/convert/v1/member.go
+++ b/api/types/accesslist/convert/v1/member.go
@@ -48,12 +48,15 @@ func FromMemberProto(msg *accesslistv1.Member, opts ...MemberOption) (*accesslis
 		// Must provide as options to set it with the provided value.
 		IneligibleStatus: "",
 	})
+	if err != nil {
+		return nil, trace.Wrap(err)
+	}
 
 	for _, opt := range opts {
 		opt(member)
 	}
 
-	return member, trace.Wrap(err)
+	return member, nil
 }
 
 // FromMembersProto converts a list of v1 access list members into a list of internal access list members.