diff --git a/src/pages/_error.tsx b/src/pages/_error.tsx
index 2e8588e1..a55333c4 100644
--- a/src/pages/_error.tsx
+++ b/src/pages/_error.tsx
@@ -60,10 +60,10 @@ function ErrorPage(props: any) {
 							</Title>
 						)}
 						<Title style={{ color: '#ffffff' }} ta="center" order={1}>
-							{errors[code].title}
+							{errors[code]?.title || errors[500].title}
 						</Title>
 						<Title style={{ color: theme.colors.gray[4] }} ta="center" order={3}>
-							{errors[code].message}
+							{errors[code]?.message || errors[500].message}
 							<br />
 							{code != 1 && (
 								<Button
diff --git a/src/pages/teams/[team]/manage/members.tsx b/src/pages/teams/[team]/manage/members.tsx
index fe9517a9..7650555e 100644
--- a/src/pages/teams/[team]/manage/members.tsx
+++ b/src/pages/teams/[team]/manage/members.tsx
@@ -253,31 +253,6 @@ const Settings = () => {
 		>
 			<SettingsTabs team={router.query.team?.toString() || ''} loading={!(builders && managers)}>
 				<SearchInput onSearch={setFilter} inputProps={{ placeholder: 'Filter...' }} />
-				<Title order={3} mt="md">
-					Builders
-				</Title>
-				<UsersTable
-					loading={!builders}
-					data={
-						builders
-							? builders.filter((b: any) =>
-									b.username? b.username?.toLowerCase().includes(filter.toLowerCase()):true,
-							  )
-							: []
-					}
-					actions={(data) => (
-						<Group gap={0} justify="flex-end">
-							<ActionIcon
-								variant="subtle"
-								color="red"
-								onClick={() => handleRemoveBuilder(data)}
-								loading={loadingManagers}
-							>
-								<IconTrash style={{ width: rem(18), height: rem(18) }} stroke={1.5} />
-							</ActionIcon>
-						</Group>
-					)}
-				/>
 				<Group justify={'space-between'}>
 					<Stack gap={0}>
 						<Title order={3} mt="md">
@@ -295,7 +270,9 @@ const Settings = () => {
 					loading={!managers}
 					data={
 						managers
-							? managers.filter((b: any) => b.username.toLowerCase().includes(filter.toLowerCase()))
+							? managers.filter((b: any) =>
+									b.username?.toLowerCase().includes(filter.toLowerCase()),
+							  )
 							: []
 					}
 					actions={(data) => (
@@ -332,6 +309,31 @@ const Settings = () => {
 						</Table.Td>
 					)}
 				/>
+				<Title order={3} mt="md">
+					Builders
+				</Title>
+				<UsersTable
+					loading={!builders}
+					data={
+						builders
+							? builders.filter((b: any) =>
+									b.username ? b.username?.toLowerCase().includes(filter.toLowerCase()) : true,
+							  )
+							: []
+					}
+					actions={(data) => (
+						<Group gap={0} justify="flex-end">
+							<ActionIcon
+								variant="subtle"
+								color="red"
+								onClick={() => handleRemoveBuilder(data)}
+								loading={loadingManagers}
+							>
+								<IconTrash style={{ width: rem(18), height: rem(18) }} stroke={1.5} />
+							</ActionIcon>
+						</Group>
+					)}
+				/>
 			</SettingsTabs>
 		</Page>
 	);