diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index 87ea131..06487a9 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -1,10 +1,8 @@
-import React from 'react';
-
-const NotFoundPage = () => (
-	<div style={{ textAlign: 'center' }}>
-		<h1>404: Not Found</h1>
-		<p>This page wasn't found...</p>
-	</div>
-);
-
-export default NotFoundPage;
+export default function NotFoundPage() {
+	return (
+		<div style={{ textAlign: 'center' }}>
+			<h1>404: Not Found</h1>
+			<p>This page wasn't found...</p>
+		</div>
+	);
+}
diff --git a/src/pages/classcouncil.tsx b/src/pages/classcouncil.tsx
index cd907ed..2e37cbd 100644
--- a/src/pages/classcouncil.tsx
+++ b/src/pages/classcouncil.tsx
@@ -8,16 +8,13 @@ export default function ClassCouncil() {
 		`*[_type == 'member' && role == 'class'] | order (year desc)`
 	);
 
-	if (!members) {
-		return null;
-	}
-
 	return (
 		<>
 			<Hero heading='Class Council' />
-			{members.map((member) => {
-				return <MemberRow key={member._id} member={member}></MemberRow>;
-			})}
+			{members &&
+				members.map((member) => {
+					return <MemberRow key={member._id} member={member}></MemberRow>;
+				})}
 		</>
 	);
 }
diff --git a/src/pages/committee.tsx b/src/pages/committee.tsx
index ff6ddef..d1f8ac2 100644
--- a/src/pages/committee.tsx
+++ b/src/pages/committee.tsx
@@ -9,17 +9,14 @@ export default function Committee() {
 	);
 	// year desc because seniority 8)
 
-	if (!excomm) {
-		return null;
-	}
-
 	return (
 		<>
 			<Hero heading='Executive Committee' />
 			<div>
-				{excomm.map((member) => {
-					return <MemberRow member={member} />;
-				})}
+				{excomm &&
+					excomm.map((member) => {
+						return <MemberRow member={member} />;
+					})}
 			</div>
 		</>
 	);
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index baff9dc..99424c8 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -3,7 +3,7 @@ import Hero from '../components/Hero';
 import NewsAndMission from '../components/NewsAndMission';
 import SegmentGroup from '../components/SegmentGroup';
 
-const IndexPage = () => {
+export default function IndexPage() {
 	return (
 		<>
 			{/* Hero image */}
@@ -20,6 +20,4 @@ const IndexPage = () => {
 			<NewsAndMission />
 		</>
 	);
-};
-
-export default IndexPage;
+}
diff --git a/src/pages/initiatives.tsx b/src/pages/initiatives.tsx
index cbe0ae3..6f5a478 100644
--- a/src/pages/initiatives.tsx
+++ b/src/pages/initiatives.tsx
@@ -8,15 +8,11 @@ export default function Initiatives() {
 		'*[_type == "initiative"]'
 	);
 
-	if (!initiatives) {
-		return null;
-	}
-
 	return (
 		<>
 			<Hero heading='Initiatives'></Hero>
 			<div style={{ display: 'flex', flexDirection: 'column' }}>
-				{initiatives.map((initiative) => {
+				{initiatives && initiatives.map((initiative) => {
 					return <InitiativeRow initiative={initiative} />;
 				})}
 			</div>
diff --git a/src/pages/mission.tsx b/src/pages/mission.tsx
index 2d82a79..4525e5f 100644
--- a/src/pages/mission.tsx
+++ b/src/pages/mission.tsx
@@ -6,46 +6,46 @@ import '../css/mission.css';
 export default function Mission() {
 	let mission = useMission();
 
-	if (!mission) {
-		return null;
-	}
-
 	return (
 		<>
 			<Hero heading='Mission and History' />
-			<div>
-				<div className='mission-quote'>
-					<span className='mission-quote-text'>“{mission.quote_text}”</span>
-					<br />
-					<br />
-					<span className='mission-quote-author'>— {mission.quote_author}</span>
-				</div>
-				<div className='row'>
-					<div className='flex-1'>
-						<span className='mission-header'>Vision</span>
+			{mission ? (
+				<div>
+					<div className='mission-quote'>
+						<span className='mission-quote-text'>“{mission.quote_text}”</span>
+						<br />
+						<br />
+						<span className='mission-quote-author'>
+							— {mission.quote_author}
+						</span>
 					</div>
-					<div className='flex-2'>
-						<p className='mission-para'>{mission.vision}</p>
+					<div className='row'>
+						<div className='flex-1'>
+							<span className='mission-header'>Vision</span>
+						</div>
+						<div className='flex-2'>
+							<p className='mission-para'>{mission.vision}</p>
+						</div>
+					</div>
+					<hr />
+					<div className='row'>
+						<div className='flex-1'>
+							<span className='mission-header'>Mission</span>
+						</div>
+						<div className='flex-2'>
+							<p className='mission-para'>{mission.mission}</p>
+						</div>
+					</div>
+					<div className='text-center'>
+						<a
+							href='https://docs.google.com/spreadsheets/d/1a3RYdqrDi1IPG9BKWQ2xhoX3YCPQKUl_FsRLvIVEMPg/edit?usp=drive_open&ouid=0'
+							className='blue-button'
+						>
+							Previous Leadership
+						</a>
 					</div>
 				</div>
-				<hr />
-				<div className='row'>
-					<div className='flex-1'>
-						<span className='mission-header'>Mission</span>
-					</div>
-					<div className='flex-2'>
-						<p className='mission-para'>{mission.mission}</p>
-					</div>
-				</div>
-				<div className='text-center'>
-					<a
-						href='https://docs.google.com/spreadsheets/d/1a3RYdqrDi1IPG9BKWQ2xhoX3YCPQKUl_FsRLvIVEMPg/edit?usp=drive_open&ouid=0'
-						className='blue-button'
-					>
-						Previous Leadership
-					</a>
-				</div>
-			</div>
+			) : null}
 		</>
 	);
 }
diff --git a/src/pages/officers.tsx b/src/pages/officers.tsx
index 1a66575..f42d901 100644
--- a/src/pages/officers.tsx
+++ b/src/pages/officers.tsx
@@ -16,9 +16,11 @@ export default function Officers() {
 		<>
 			<Hero heading='Officers' />
 			<div>
-				{officers.map((officer) => {
-					return <MemberRow member={officer} />;
-				})}
+				{officers
+					? officers.map((officer) => {
+							return <MemberRow member={officer} />;
+					  })
+					: null}
 			</div>
 		</>
 	);