diff --git a/crates/api/src/comment/distinguish.rs b/crates/api/src/comment/distinguish.rs
index dc2be8ad80..dfd850e899 100644
--- a/crates/api/src/comment/distinguish.rs
+++ b/crates/api/src/comment/distinguish.rs
@@ -17,7 +17,9 @@ pub async fn distinguish_comment(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommentResponse>> {
-  let orig_comment = CommentView::read(&mut context.pool(), data.comment_id, None).await?;
+  let orig_comment = CommentView::read(&mut context.pool(), data.comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -54,7 +56,8 @@ pub async fn distinguish_comment(
     data.comment_id,
     Some(local_user_view.person.id),
   )
-  .await?;
+  .await?
+  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   Ok(Json(CommentResponse {
     comment_view,
diff --git a/crates/api/src/comment/like.rs b/crates/api/src/comment/like.rs
index bfa522739c..d0aa4a6c26 100644
--- a/crates/api/src/comment/like.rs
+++ b/crates/api/src/comment/like.rs
@@ -35,7 +35,9 @@ pub async fn like_comment(
   check_bot_account(&local_user_view.person)?;
 
   let comment_id = data.comment_id;
-  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None).await?;
+  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -46,9 +48,10 @@ pub async fn like_comment(
 
   // Add parent poster or commenter to recipients
   let comment_reply = CommentReply::read_by_comment(&mut context.pool(), comment_id).await;
-  if let Ok(reply) = comment_reply {
+  if let Ok(Some(reply)) = comment_reply {
     let recipient_id = reply.recipient_id;
-    if let Ok(local_recipient) = LocalUserView::read_person(&mut context.pool(), recipient_id).await
+    if let Ok(Some(local_recipient)) =
+      LocalUserView::read_person(&mut context.pool(), recipient_id).await
     {
       recipient_ids.push(local_recipient.local_user.id);
     }
diff --git a/crates/api/src/comment/list_comment_likes.rs b/crates/api/src/comment/list_comment_likes.rs
index 649ae249db..8c2c9dd32b 100644
--- a/crates/api/src/comment/list_comment_likes.rs
+++ b/crates/api/src/comment/list_comment_likes.rs
@@ -5,7 +5,7 @@ use lemmy_api_common::{
   utils::is_mod_or_admin,
 };
 use lemmy_db_views::structs::{CommentView, LocalUserView, VoteView};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 /// Lists likes for a comment
 #[tracing::instrument(skip(context))]
@@ -19,7 +19,9 @@ pub async fn list_comment_likes(
     data.comment_id,
     Some(local_user_view.person.id),
   )
-  .await?;
+  .await?
+  .ok_or(LemmyErrorType::CouldntFindComment)?;
+
   is_mod_or_admin(
     &mut context.pool(),
     &local_user_view.person,
diff --git a/crates/api/src/comment/save.rs b/crates/api/src/comment/save.rs
index f197ecb4cb..f9d649e487 100644
--- a/crates/api/src/comment/save.rs
+++ b/crates/api/src/comment/save.rs
@@ -33,7 +33,9 @@ pub async fn save_comment(
 
   let comment_id = data.comment_id;
   let person_id = local_user_view.person.id;
-  let comment_view = CommentView::read(&mut context.pool(), comment_id, Some(person_id)).await?;
+  let comment_view = CommentView::read(&mut context.pool(), comment_id, Some(person_id))
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   Ok(Json(CommentResponse {
     comment_view,
diff --git a/crates/api/src/comment_report/create.rs b/crates/api/src/comment_report/create.rs
index de40571fe2..c008d1df27 100644
--- a/crates/api/src/comment_report/create.rs
+++ b/crates/api/src/comment_report/create.rs
@@ -35,7 +35,9 @@ pub async fn create_comment_report(
 
   let person_id = local_user_view.person.id;
   let comment_id = data.comment_id;
-  let comment_view = CommentView::read(&mut context.pool(), comment_id, None).await?;
+  let comment_view = CommentView::read(&mut context.pool(), comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -58,8 +60,9 @@ pub async fn create_comment_report(
     .await
     .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-  let comment_report_view =
-    CommentReportView::read(&mut context.pool(), report.id, person_id).await?;
+  let comment_report_view = CommentReportView::read(&mut context.pool(), report.id, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommentReport)?;
 
   // Email the admins
   if local_site.reports_email_admins {
diff --git a/crates/api/src/comment_report/resolve.rs b/crates/api/src/comment_report/resolve.rs
index a663fdf747..40aad95695 100644
--- a/crates/api/src/comment_report/resolve.rs
+++ b/crates/api/src/comment_report/resolve.rs
@@ -17,7 +17,9 @@ pub async fn resolve_comment_report(
 ) -> LemmyResult<Json<CommentReportResponse>> {
   let report_id = data.report_id;
   let person_id = local_user_view.person.id;
-  let report = CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
+  let report = CommentReportView::read(&mut context.pool(), report_id, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommentReport)?;
 
   let person_id = local_user_view.person.id;
   check_community_mod_action(
@@ -39,8 +41,9 @@ pub async fn resolve_comment_report(
   }
 
   let report_id = data.report_id;
-  let comment_report_view =
-    CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
+  let comment_report_view = CommentReportView::read(&mut context.pool(), report_id, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommentReport)?;
 
   Ok(Json(CommentReportResponse {
     comment_report_view,
diff --git a/crates/api/src/community/add_mod.rs b/crates/api/src/community/add_mod.rs
index 92799fb6bc..df6b3fbe43 100644
--- a/crates/api/src/community/add_mod.rs
+++ b/crates/api/src/community/add_mod.rs
@@ -33,7 +33,9 @@ pub async fn add_mod_to_community(
     &mut context.pool(),
   )
   .await?;
-  let community = Community::read(&mut context.pool(), community_id).await?;
+  let community = Community::read(&mut context.pool(), community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   if local_user_view.local_user.admin && !community.local {
     Err(LemmyErrorType::NotAModerator)?
   }
diff --git a/crates/api/src/community/ban.rs b/crates/api/src/community/ban.rs
index 0ad9952df8..93cf004156 100644
--- a/crates/api/src/community/ban.rs
+++ b/crates/api/src/community/ban.rs
@@ -89,7 +89,9 @@ pub async fn ban_from_community(
 
   ModBanFromCommunity::create(&mut context.pool(), &form).await?;
 
-  let person_view = PersonView::read(&mut context.pool(), data.person_id).await?;
+  let person_view = PersonView::read(&mut context.pool(), data.person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   ActivityChannel::submit_activity(
     SendActivityData::BanFromCommunity {
diff --git a/crates/api/src/community/block.rs b/crates/api/src/community/block.rs
index d5d8a0287c..449addf326 100644
--- a/crates/api/src/community/block.rs
+++ b/crates/api/src/community/block.rs
@@ -51,7 +51,9 @@ pub async fn block_community(
   }
 
   let community_view =
-    CommunityView::read(&mut context.pool(), community_id, Some(person_id), false).await?;
+    CommunityView::read(&mut context.pool(), community_id, Some(person_id), false)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   ActivityChannel::submit_activity(
     SendActivityData::FollowCommunity(
diff --git a/crates/api/src/community/follow.rs b/crates/api/src/community/follow.rs
index 94109192b5..853cfde143 100644
--- a/crates/api/src/community/follow.rs
+++ b/crates/api/src/community/follow.rs
@@ -23,7 +23,9 @@ pub async fn follow_community(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommunityResponse>> {
-  let community = Community::read(&mut context.pool(), data.community_id).await?;
+  let community = Community::read(&mut context.pool(), data.community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   let mut community_follower_form = CommunityFollowerForm {
     community_id: community.id,
     person_id: local_user_view.person.id,
@@ -62,7 +64,10 @@ pub async fn follow_community(
   let community_id = data.community_id;
   let person_id = local_user_view.person.id;
   let community_view =
-    CommunityView::read(&mut context.pool(), community_id, Some(person_id), false).await?;
+    CommunityView::read(&mut context.pool(), community_id, Some(person_id), false)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
+
   let discussion_languages = CommunityLanguage::read(&mut context.pool(), community_id).await?;
 
   Ok(Json(CommunityResponse {
diff --git a/crates/api/src/community/transfer.rs b/crates/api/src/community/transfer.rs
index 399eeadaec..5f3a6032e2 100644
--- a/crates/api/src/community/transfer.rs
+++ b/crates/api/src/community/transfer.rs
@@ -79,8 +79,8 @@ pub async fn transfer_community(
   let person_id = local_user_view.person.id;
   let community_view =
     CommunityView::read(&mut context.pool(), community_id, Some(person_id), false)
-      .await
-      .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?;
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   let community_id = data.community_id;
   let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id)
diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
index 498dff3bd1..4eee772c90 100644
--- a/crates/api/src/lib.rs
+++ b/crates/api/src/lib.rs
@@ -252,7 +252,9 @@ pub async fn local_user_view_from_jwt(
   let local_user_id = Claims::validate(jwt, context)
     .await
     .with_lemmy_type(LemmyErrorType::NotLoggedIn)?;
-  let local_user_view = LocalUserView::read(&mut context.pool(), local_user_id).await?;
+  let local_user_view = LocalUserView::read(&mut context.pool(), local_user_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindLocalUser)?;
   check_user_valid(&local_user_view.person)?;
 
   Ok(local_user_view)
diff --git a/crates/api/src/local_user/add_admin.rs b/crates/api/src/local_user/add_admin.rs
index 6ebdbd08fb..cd827454ea 100644
--- a/crates/api/src/local_user/add_admin.rs
+++ b/crates/api/src/local_user/add_admin.rs
@@ -26,8 +26,8 @@ pub async fn add_admin(
 
   // Make sure that the person_id added is local
   let added_local_user = LocalUserView::read_person(&mut context.pool(), data.person_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::ObjectNotLocal)?;
+    .await?
+    .ok_or(LemmyErrorType::ObjectNotLocal)?;
 
   let added_admin = LocalUser::update(
     &mut context.pool(),
diff --git a/crates/api/src/local_user/ban_person.rs b/crates/api/src/local_user/ban_person.rs
index f0e6ffc267..c31940fba4 100644
--- a/crates/api/src/local_user/ban_person.rs
+++ b/crates/api/src/local_user/ban_person.rs
@@ -49,7 +49,7 @@ pub async fn ban_from_site(
 
   // if its a local user, invalidate logins
   let local_user = LocalUserView::read_person(&mut context.pool(), person.id).await;
-  if let Ok(local_user) = local_user {
+  if let Ok(Some(local_user)) = local_user {
     LoginToken::invalidate_all(&mut context.pool(), local_user.local_user.id).await?;
   }
 
@@ -70,7 +70,9 @@ pub async fn ban_from_site(
 
   ModBan::create(&mut context.pool(), &form).await?;
 
-  let person_view = PersonView::read(&mut context.pool(), person.id).await?;
+  let person_view = PersonView::read(&mut context.pool(), person.id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   ban_nonlocal_user_from_local_communities(
     &local_user_view,
diff --git a/crates/api/src/local_user/block.rs b/crates/api/src/local_user/block.rs
index 46a1e44aac..698703a9b0 100644
--- a/crates/api/src/local_user/block.rs
+++ b/crates/api/src/local_user/block.rs
@@ -30,8 +30,12 @@ pub async fn block_person(
     target_id,
   };
 
-  let target_user = LocalUserView::read_person(&mut context.pool(), target_id).await;
-  if target_user.map(|t| t.local_user.admin) == Ok(true) {
+  let target_user = LocalUserView::read_person(&mut context.pool(), target_id)
+    .await
+    .ok()
+    .flatten();
+
+  if target_user.is_some_and(|t| t.local_user.admin) {
     Err(LemmyErrorType::CantBlockAdmin)?
   }
 
@@ -45,7 +49,9 @@ pub async fn block_person(
       .with_lemmy_type(LemmyErrorType::PersonBlockAlreadyExists)?;
   }
 
-  let person_view = PersonView::read(&mut context.pool(), target_id).await?;
+  let person_view = PersonView::read(&mut context.pool(), target_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
   Ok(Json(BlockPersonResponse {
     person_view,
     blocked: data.block,
diff --git a/crates/api/src/local_user/change_password_after_reset.rs b/crates/api/src/local_user/change_password_after_reset.rs
index 9d759d7e97..9d693a750a 100644
--- a/crates/api/src/local_user/change_password_after_reset.rs
+++ b/crates/api/src/local_user/change_password_after_reset.rs
@@ -20,8 +20,9 @@ pub async fn change_password_after_reset(
   // Fetch the user_id from the token
   let token = data.token.clone();
   let local_user_id = PasswordResetRequest::read_from_token(&mut context.pool(), &token)
-    .await
-    .map(|p| p.local_user_id)?;
+    .await?
+    .ok_or(LemmyErrorType::TokenNotFound)?
+    .local_user_id;
 
   password_length_check(&data.password)?;
 
diff --git a/crates/api/src/local_user/generate_totp_secret.rs b/crates/api/src/local_user/generate_totp_secret.rs
index 285fa2ad5d..e8bb0284c3 100644
--- a/crates/api/src/local_user/generate_totp_secret.rs
+++ b/crates/api/src/local_user/generate_totp_secret.rs
@@ -17,7 +17,9 @@ pub async fn generate_totp_secret(
   local_user_view: LocalUserView,
   context: Data<LemmyContext>,
 ) -> LemmyResult<Json<GenerateTotpSecretResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   if local_user_view.local_user.totp_2fa_enabled {
     return Err(LemmyErrorType::TotpAlreadyEnabled)?;
diff --git a/crates/api/src/local_user/login.rs b/crates/api/src/local_user/login.rs
index 8e3301af92..19f84f7034 100644
--- a/crates/api/src/local_user/login.rs
+++ b/crates/api/src/local_user/login.rs
@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   RegistrationMode,
 };
 use lemmy_db_views::structs::{LocalUserView, SiteView};
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 #[tracing::instrument(skip(context))]
 pub async fn login(
@@ -24,14 +24,16 @@ pub async fn login(
   req: HttpRequest,
   context: Data<LemmyContext>,
 ) -> LemmyResult<Json<LoginResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   // Fetch that username / email
   let username_or_email = data.username_or_email.clone();
   let local_user_view =
     LocalUserView::find_by_email_or_name(&mut context.pool(), &username_or_email)
-      .await
-      .with_lemmy_type(LemmyErrorType::IncorrectLogin)?;
+      .await?
+      .ok_or(LemmyErrorType::IncorrectLogin)?;
 
   // Verify the password
   let valid: bool = verify(
@@ -79,7 +81,9 @@ async fn check_registration_application(
     // Fetch the registration application. If no admin id is present its still pending. Otherwise it
     // was processed (either accepted or denied).
     let local_user_id = local_user_view.local_user.id;
-    let registration = RegistrationApplication::find_by_local_user_id(pool, local_user_id).await?;
+    let registration = RegistrationApplication::find_by_local_user_id(pool, local_user_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindRegistrationApplication)?;
     if registration.admin_id.is_some() {
       Err(LemmyErrorType::RegistrationDenied(registration.deny_reason))?
     } else {
diff --git a/crates/api/src/local_user/notifications/mark_mention_read.rs b/crates/api/src/local_user/notifications/mark_mention_read.rs
index 9a839b2b41..90c8efb6e2 100644
--- a/crates/api/src/local_user/notifications/mark_mention_read.rs
+++ b/crates/api/src/local_user/notifications/mark_mention_read.rs
@@ -18,7 +18,9 @@ pub async fn mark_person_mention_as_read(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PersonMentionResponse>> {
   let person_mention_id = data.person_mention_id;
-  let read_person_mention = PersonMention::read(&mut context.pool(), person_mention_id).await?;
+  let read_person_mention = PersonMention::read(&mut context.pool(), person_mention_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPersonMention)?;
 
   if local_user_view.person.id != read_person_mention.recipient_id {
     Err(LemmyErrorType::CouldntUpdateComment)?
@@ -37,7 +39,9 @@ pub async fn mark_person_mention_as_read(
   let person_mention_id = read_person_mention.id;
   let person_id = local_user_view.person.id;
   let person_mention_view =
-    PersonMentionView::read(&mut context.pool(), person_mention_id, Some(person_id)).await?;
+    PersonMentionView::read(&mut context.pool(), person_mention_id, Some(person_id))
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPersonMention)?;
 
   Ok(Json(PersonMentionResponse {
     person_mention_view,
diff --git a/crates/api/src/local_user/notifications/mark_reply_read.rs b/crates/api/src/local_user/notifications/mark_reply_read.rs
index 5b263145fd..fdcfa57274 100644
--- a/crates/api/src/local_user/notifications/mark_reply_read.rs
+++ b/crates/api/src/local_user/notifications/mark_reply_read.rs
@@ -18,7 +18,9 @@ pub async fn mark_reply_as_read(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommentReplyResponse>> {
   let comment_reply_id = data.comment_reply_id;
-  let read_comment_reply = CommentReply::read(&mut context.pool(), comment_reply_id).await?;
+  let read_comment_reply = CommentReply::read(&mut context.pool(), comment_reply_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommentReply)?;
 
   if local_user_view.person.id != read_comment_reply.recipient_id {
     Err(LemmyErrorType::CouldntUpdateComment)?
@@ -38,7 +40,9 @@ pub async fn mark_reply_as_read(
   let comment_reply_id = read_comment_reply.id;
   let person_id = local_user_view.person.id;
   let comment_reply_view =
-    CommentReplyView::read(&mut context.pool(), comment_reply_id, Some(person_id)).await?;
+    CommentReplyView::read(&mut context.pool(), comment_reply_id, Some(person_id))
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommentReply)?;
 
   Ok(Json(CommentReplyResponse { comment_reply_view }))
 }
diff --git a/crates/api/src/local_user/reset_password.rs b/crates/api/src/local_user/reset_password.rs
index 414f506ba4..edb5adee6b 100644
--- a/crates/api/src/local_user/reset_password.rs
+++ b/crates/api/src/local_user/reset_password.rs
@@ -8,7 +8,7 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::source::password_reset_request::PasswordResetRequest;
 use lemmy_db_views::structs::{LocalUserView, SiteView};
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 #[tracing::instrument(skip(context))]
 pub async fn reset_password(
@@ -18,8 +18,8 @@ pub async fn reset_password(
   // Fetch that email
   let email = data.email.to_lowercase();
   let local_user_view = LocalUserView::find_by_email(&mut context.pool(), &email)
-    .await
-    .with_lemmy_type(LemmyErrorType::IncorrectLogin)?;
+    .await?
+    .ok_or(LemmyErrorType::IncorrectLogin)?;
 
   // Check for too many attempts (to limit potential abuse)
   let recent_resets_count = PasswordResetRequest::get_recent_password_resets_count(
@@ -30,7 +30,9 @@ pub async fn reset_password(
   if recent_resets_count >= 3 {
     Err(LemmyErrorType::PasswordResetLimitReached)?
   }
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   check_email_verified(&local_user_view, &site_view)?;
 
   // Email the pure token to the user.
diff --git a/crates/api/src/local_user/save_settings.rs b/crates/api/src/local_user/save_settings.rs
index 3fa835f58b..0805eb6979 100644
--- a/crates/api/src/local_user/save_settings.rs
+++ b/crates/api/src/local_user/save_settings.rs
@@ -35,7 +35,9 @@ pub async fn save_user_settings(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<SuccessResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   let slur_regex = local_site_to_slur_regex(&site_view.local_site);
   let url_blocklist = get_url_blocklist(&context).await?;
diff --git a/crates/api/src/local_user/verify_email.rs b/crates/api/src/local_user/verify_email.rs
index 94ddb373af..da490bf63d 100644
--- a/crates/api/src/local_user/verify_email.rs
+++ b/crates/api/src/local_user/verify_email.rs
@@ -15,17 +15,19 @@ use lemmy_db_schema::{
   RegistrationMode,
 };
 use lemmy_db_views::structs::SiteView;
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn verify_email(
   data: Json<VerifyEmail>,
   context: Data<LemmyContext>,
 ) -> LemmyResult<Json<SuccessResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let token = data.token.clone();
   let verification = EmailVerification::read_for_token(&mut context.pool(), &token)
-    .await
-    .with_lemmy_type(LemmyErrorType::TokenNotFound)?;
+    .await?
+    .ok_or(LemmyErrorType::TokenNotFound)?;
 
   let form = LocalUserUpdateForm {
     // necessary in case this is a new signup
@@ -44,7 +46,10 @@ pub async fn verify_email(
   if site_view.local_site.registration_mode == RegistrationMode::RequireApplication
     && site_view.local_site.application_email_admins
   {
-    let person = Person::read(&mut context.pool(), local_user.person_id).await?;
+    let person = Person::read(&mut context.pool(), local_user.person_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?;
+
     send_new_applicant_email_to_admins(&person.name, &mut context.pool(), context.settings())
       .await?;
   }
diff --git a/crates/api/src/post/feature.rs b/crates/api/src/post/feature.rs
index 566ca3a0b6..40cbf67941 100644
--- a/crates/api/src/post/feature.rs
+++ b/crates/api/src/post/feature.rs
@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   PostFeatureType,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn feature_post(
@@ -25,7 +25,9 @@ pub async fn feature_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let orig_post = Post::read(&mut context.pool(), post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_mod_action(
     &local_user_view.person,
diff --git a/crates/api/src/post/like.rs b/crates/api/src/post/like.rs
index 1cbdba8e28..707874dedb 100644
--- a/crates/api/src/post/like.rs
+++ b/crates/api/src/post/like.rs
@@ -38,7 +38,9 @@ pub async fn like_post(
 
   // Check for a community ban
   let post_id = data.post_id;
-  let post = Post::read(&mut context.pool(), post_id).await?;
+  let post = Post::read(&mut context.pool(), post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -69,11 +71,15 @@ pub async fn like_post(
   // Mark the post as read
   mark_post_as_read(person_id, post_id, &mut context.pool()).await?;
 
+  let community = Community::read(&mut context.pool(), post.community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
+
   ActivityChannel::submit_activity(
     SendActivityData::LikePostOrComment {
       object_id: post.ap_id,
       actor: local_user_view.person.clone(),
-      community: Community::read(&mut context.pool(), post.community_id).await?,
+      community,
       score: data.score,
     },
     &context,
diff --git a/crates/api/src/post/list_post_likes.rs b/crates/api/src/post/list_post_likes.rs
index a9b302f2e6..b9b2106b74 100644
--- a/crates/api/src/post/list_post_likes.rs
+++ b/crates/api/src/post/list_post_likes.rs
@@ -6,7 +6,7 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::{source::post::Post, traits::Crud};
 use lemmy_db_views::structs::{LocalUserView, VoteView};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 /// Lists likes for a post
 #[tracing::instrument(skip(context))]
@@ -15,7 +15,9 @@ pub async fn list_post_likes(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<ListPostLikesResponse>> {
-  let post = Post::read(&mut context.pool(), data.post_id).await?;
+  let post = Post::read(&mut context.pool(), data.post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
   is_mod_or_admin(
     &mut context.pool(),
     &local_user_view.person,
diff --git a/crates/api/src/post/lock.rs b/crates/api/src/post/lock.rs
index b48c415af6..05db8ebbb1 100644
--- a/crates/api/src/post/lock.rs
+++ b/crates/api/src/post/lock.rs
@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn lock_post(
@@ -24,7 +24,9 @@ pub async fn lock_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let orig_post = Post::read(&mut context.pool(), post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_mod_action(
     &local_user_view.person,
diff --git a/crates/api/src/post/save.rs b/crates/api/src/post/save.rs
index 05c7b35898..0876992ad8 100644
--- a/crates/api/src/post/save.rs
+++ b/crates/api/src/post/save.rs
@@ -34,7 +34,9 @@ pub async fn save_post(
 
   let post_id = data.post_id;
   let person_id = local_user_view.person.id;
-  let post_view = PostView::read(&mut context.pool(), post_id, Some(person_id), false).await?;
+  let post_view = PostView::read(&mut context.pool(), post_id, Some(person_id), false)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   // Mark the post as read
   mark_post_as_read(person_id, post_id, &mut context.pool()).await?;
diff --git a/crates/api/src/post_report/create.rs b/crates/api/src/post_report/create.rs
index 590c9af40d..72a40f70d7 100644
--- a/crates/api/src/post_report/create.rs
+++ b/crates/api/src/post_report/create.rs
@@ -35,7 +35,9 @@ pub async fn create_post_report(
 
   let person_id = local_user_view.person.id;
   let post_id = data.post_id;
-  let post_view = PostView::read(&mut context.pool(), post_id, None, false).await?;
+  let post_view = PostView::read(&mut context.pool(), post_id, None, false)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -59,7 +61,9 @@ pub async fn create_post_report(
     .await
     .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-  let post_report_view = PostReportView::read(&mut context.pool(), report.id, person_id).await?;
+  let post_report_view = PostReportView::read(&mut context.pool(), report.id, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPostReport)?;
 
   // Email the admins
   if local_site.reports_email_admins {
diff --git a/crates/api/src/post_report/resolve.rs b/crates/api/src/post_report/resolve.rs
index a3cb85c6c8..428619674c 100644
--- a/crates/api/src/post_report/resolve.rs
+++ b/crates/api/src/post_report/resolve.rs
@@ -17,7 +17,9 @@ pub async fn resolve_post_report(
 ) -> LemmyResult<Json<PostReportResponse>> {
   let report_id = data.report_id;
   let person_id = local_user_view.person.id;
-  let report = PostReportView::read(&mut context.pool(), report_id, person_id).await?;
+  let report = PostReportView::read(&mut context.pool(), report_id, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPostReport)?;
 
   let person_id = local_user_view.person.id;
   check_community_mod_action(
@@ -38,7 +40,9 @@ pub async fn resolve_post_report(
       .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
   }
 
-  let post_report_view = PostReportView::read(&mut context.pool(), report_id, person_id).await?;
+  let post_report_view = PostReportView::read(&mut context.pool(), report_id, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPostReport)?;
 
   Ok(Json(PostReportResponse { post_report_view }))
 }
diff --git a/crates/api/src/private_message/mark_read.rs b/crates/api/src/private_message/mark_read.rs
index 7c213464b6..07e06fe21a 100644
--- a/crates/api/src/private_message/mark_read.rs
+++ b/crates/api/src/private_message/mark_read.rs
@@ -18,7 +18,9 @@ pub async fn mark_pm_as_read(
 ) -> LemmyResult<Json<PrivateMessageResponse>> {
   // Checking permissions
   let private_message_id = data.private_message_id;
-  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
+  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   if local_user_view.person.id != orig_private_message.recipient_id {
     Err(LemmyErrorType::CouldntUpdatePrivateMessage)?
   }
@@ -37,7 +39,9 @@ pub async fn mark_pm_as_read(
   .await
   .with_lemmy_type(LemmyErrorType::CouldntUpdatePrivateMessage)?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
+  let view = PrivateMessageView::read(&mut context.pool(), private_message_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   Ok(Json(PrivateMessageResponse {
     private_message_view: view,
   }))
diff --git a/crates/api/src/private_message_report/create.rs b/crates/api/src/private_message_report/create.rs
index de8ca390fa..41ac592ae6 100644
--- a/crates/api/src/private_message_report/create.rs
+++ b/crates/api/src/private_message_report/create.rs
@@ -29,7 +29,9 @@ pub async fn create_pm_report(
 
   let person_id = local_user_view.person.id;
   let private_message_id = data.private_message_id;
-  let private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
+  let private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
 
   // Make sure that only the recipient of the private message can create a report
   if person_id != private_message.recipient_id {
@@ -47,8 +49,9 @@ pub async fn create_pm_report(
     .await
     .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-  let private_message_report_view =
-    PrivateMessageReportView::read(&mut context.pool(), report.id).await?;
+  let private_message_report_view = PrivateMessageReportView::read(&mut context.pool(), report.id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessageReport)?;
 
   // Email the admins
   if local_site.reports_email_admins {
diff --git a/crates/api/src/private_message_report/resolve.rs b/crates/api/src/private_message_report/resolve.rs
index 7d821a60c9..27847eeaf3 100644
--- a/crates/api/src/private_message_report/resolve.rs
+++ b/crates/api/src/private_message_report/resolve.rs
@@ -28,8 +28,9 @@ pub async fn resolve_pm_report(
       .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
   }
 
-  let private_message_report_view =
-    PrivateMessageReportView::read(&mut context.pool(), report_id).await?;
+  let private_message_report_view = PrivateMessageReportView::read(&mut context.pool(), report_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessageReport)?;
 
   Ok(Json(PrivateMessageReportResponse {
     private_message_report_view,
diff --git a/crates/api/src/site/federated_instances.rs b/crates/api/src/site/federated_instances.rs
index 5943cfd9a8..66b0ff2c17 100644
--- a/crates/api/src/site/federated_instances.rs
+++ b/crates/api/src/site/federated_instances.rs
@@ -5,13 +5,15 @@ use lemmy_api_common::{
   utils::build_federated_instances,
 };
 use lemmy_db_views::structs::SiteView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn get_federated_instances(
   context: Data<LemmyContext>,
 ) -> LemmyResult<Json<GetFederatedInstancesResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let federated_instances =
     build_federated_instances(&site_view.local_site, &mut context.pool()).await?;
 
diff --git a/crates/api/src/site/leave_admin.rs b/crates/api/src/site/leave_admin.rs
index 52b8a32ef7..e7a5464f3b 100644
--- a/crates/api/src/site/leave_admin.rs
+++ b/crates/api/src/site/leave_admin.rs
@@ -55,7 +55,9 @@ pub async fn leave_admin(
   ModAdd::create(&mut context.pool(), &form).await?;
 
   // Reread site and admins
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let admins = PersonView::admins(&mut context.pool()).await?;
 
   let all_languages = Language::read_all(&mut context.pool()).await?;
diff --git a/crates/api/src/site/purge/comment.rs b/crates/api/src/site/purge/comment.rs
index cbb3637f0a..70d95e1604 100644
--- a/crates/api/src/site/purge/comment.rs
+++ b/crates/api/src/site/purge/comment.rs
@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::{CommentView, LocalUserView};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_comment(
@@ -29,7 +29,9 @@ pub async fn purge_comment(
   let comment_id = data.comment_id;
 
   // Read the comment to get the post_id and community
-  let comment_view = CommentView::read(&mut context.pool(), comment_id, None).await?;
+  let comment_view = CommentView::read(&mut context.pool(), comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   let post_id = comment_view.comment.post_id;
 
diff --git a/crates/api/src/site/purge/community.rs b/crates/api/src/site/purge/community.rs
index 96c9c19cdf..14b2506817 100644
--- a/crates/api/src/site/purge/community.rs
+++ b/crates/api/src/site/purge/community.rs
@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_community(
@@ -28,7 +28,9 @@ pub async fn purge_community(
   is_admin(&local_user_view)?;
 
   // Read the community to get its images
-  let community = Community::read(&mut context.pool(), data.community_id).await?;
+  let community = Community::read(&mut context.pool(), data.community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   if let Some(banner) = &community.banner {
     purge_image_from_pictrs(banner, &context).await.ok();
diff --git a/crates/api/src/site/purge/person.rs b/crates/api/src/site/purge/person.rs
index a8233f76df..1b38752c7c 100644
--- a/crates/api/src/site/purge/person.rs
+++ b/crates/api/src/site/purge/person.rs
@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_person(
@@ -27,7 +27,9 @@ pub async fn purge_person(
   // Only let admin purge an item
   is_admin(&local_user_view)?;
 
-  let person = Person::read(&mut context.pool(), data.person_id).await?;
+  let person = Person::read(&mut context.pool(), data.person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
   ban_nonlocal_user_from_local_communities(
     &local_user_view,
     &person,
diff --git a/crates/api/src/site/purge/post.rs b/crates/api/src/site/purge/post.rs
index ff34c471af..75cd021d1f 100644
--- a/crates/api/src/site/purge/post.rs
+++ b/crates/api/src/site/purge/post.rs
@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_post(
@@ -28,7 +28,9 @@ pub async fn purge_post(
   is_admin(&local_user_view)?;
 
   // Read the post to get the community_id
-  let post = Post::read(&mut context.pool(), data.post_id).await?;
+  let post = Post::read(&mut context.pool(), data.post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   // Purge image
   if let Some(url) = &post.url {
diff --git a/crates/api/src/site/registration_applications/approve.rs b/crates/api/src/site/registration_applications/approve.rs
index df3c3b4282..0fb55ffc8c 100644
--- a/crates/api/src/site/registration_applications/approve.rs
+++ b/crates/api/src/site/registration_applications/approve.rs
@@ -13,7 +13,7 @@ use lemmy_db_schema::{
   utils::diesel_option_overwrite,
 };
 use lemmy_db_views::structs::{LocalUserView, RegistrationApplicationView};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 pub async fn approve_registration_application(
   data: Json<ApproveRegistrationApplication>,
@@ -45,8 +45,9 @@ pub async fn approve_registration_application(
   LocalUser::update(&mut context.pool(), approved_user_id, &local_user_form).await?;
 
   if data.approve {
-    let approved_local_user_view =
-      LocalUserView::read(&mut context.pool(), approved_user_id).await?;
+    let approved_local_user_view = LocalUserView::read(&mut context.pool(), approved_user_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindLocalUser)?;
 
     if approved_local_user_view.local_user.email.is_some() {
       send_application_approved_email(&approved_local_user_view, context.settings()).await?;
@@ -54,8 +55,9 @@ pub async fn approve_registration_application(
   }
 
   // Read the view
-  let registration_application =
-    RegistrationApplicationView::read(&mut context.pool(), app_id).await?;
+  let registration_application = RegistrationApplicationView::read(&mut context.pool(), app_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindRegistrationApplication)?;
 
   Ok(Json(RegistrationApplicationResponse {
     registration_application,
diff --git a/crates/api_common/src/build_response.rs b/crates/api_common/src/build_response.rs
index cd55d399c7..f77a908822 100644
--- a/crates/api_common/src/build_response.rs
+++ b/crates/api_common/src/build_response.rs
@@ -27,6 +27,7 @@ use lemmy_db_views_actor::structs::CommunityView;
 use lemmy_utils::{
   error::LemmyResult,
   utils::{markdown::markdown_to_html, mention::MentionData},
+  LemmyErrorType,
 };
 
 pub async fn build_comment_response(
@@ -36,7 +37,9 @@ pub async fn build_comment_response(
   recipient_ids: Vec<LocalUserId>,
 ) -> LemmyResult<CommentResponse> {
   let person_id = local_user_view.map(|l| l.person.id);
-  let comment_view = CommentView::read(&mut context.pool(), comment_id, person_id).await?;
+  let comment_view = CommentView::read(&mut context.pool(), comment_id, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
   Ok(CommentResponse {
     comment_view,
     recipient_ids,
@@ -58,7 +61,8 @@ pub async fn build_community_response(
     Some(person_id),
     is_mod_or_admin,
   )
-  .await?;
+  .await?
+  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   let discussion_languages = CommunityLanguage::read(&mut context.pool(), community_id).await?;
 
   Ok(Json(CommunityResponse {
@@ -82,7 +86,8 @@ pub async fn build_post_response(
     Some(person.id),
     is_mod_or_admin,
   )
-  .await?;
+  .await?
+  .ok_or(LemmyErrorType::CouldntFindPost)?;
   Ok(Json(PostResponse { post_view }))
 }
 
@@ -99,7 +104,9 @@ pub async fn send_local_notifs(
   let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname());
 
   // Read the comment view to get extra info
-  let comment_view = CommentView::read(&mut context.pool(), comment_id, None).await?;
+  let comment_view = CommentView::read(&mut context.pool(), comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
   let comment = comment_view.comment;
   let post = comment_view.post;
   let community = comment_view.community;
@@ -111,7 +118,7 @@ pub async fn send_local_notifs(
   {
     let mention_name = mention.name.clone();
     let user_view = LocalUserView::read_from_name(&mut context.pool(), &mention_name).await;
-    if let Ok(mention_user_view) = user_view {
+    if let Ok(Some(mention_user_view)) = user_view {
       // TODO
       // At some point, make it so you can't tag the parent creator either
       // Potential duplication of notifications, one for reply and the other for mention, is handled below by checking recipient ids
@@ -146,7 +153,9 @@ pub async fn send_local_notifs(
 
   // Send comment_reply to the parent commenter / poster
   if let Some(parent_comment_id) = comment.parent_comment_id() {
-    let parent_comment = Comment::read(&mut context.pool(), parent_comment_id).await?;
+    let parent_comment = Comment::read(&mut context.pool(), parent_comment_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindComment)?;
 
     // Get the parent commenter local_user
     let parent_creator_id = parent_comment.creator_id;
@@ -165,7 +174,7 @@ pub async fn send_local_notifs(
     // Don't send a notif to yourself
     if parent_comment.creator_id != person.id && !check_blocks {
       let user_view = LocalUserView::read_person(&mut context.pool(), parent_creator_id).await;
-      if let Ok(parent_user_view) = user_view {
+      if let Ok(Some(parent_user_view)) = user_view {
         // Don't duplicate notif if already mentioned by checking recipient ids
         if !recipient_ids.contains(&parent_user_view.local_user.id) {
           recipient_ids.push(parent_user_view.local_user.id);
@@ -212,7 +221,7 @@ pub async fn send_local_notifs(
     if post.creator_id != person.id && !check_blocks {
       let creator_id = post.creator_id;
       let parent_user = LocalUserView::read_person(&mut context.pool(), creator_id).await;
-      if let Ok(parent_user_view) = parent_user {
+      if let Ok(Some(parent_user_view)) = parent_user {
         if !recipient_ids.contains(&parent_user_view.local_user.id) {
           recipient_ids.push(parent_user_view.local_user.id);
 
diff --git a/crates/api_common/src/claims.rs b/crates/api_common/src/claims.rs
index 19145488a7..a926cb0ba8 100644
--- a/crates/api_common/src/claims.rs
+++ b/crates/api_common/src/claims.rs
@@ -99,7 +99,7 @@ mod tests {
   async fn test_should_not_validate_user_token_after_password_change() {
     let pool_ = build_db_pool_for_tests().await;
     let pool = &mut (&pool_).into();
-    let secret = Secret::init(pool).await.unwrap();
+    let secret = Secret::init(pool).await.unwrap().unwrap();
     let context = LemmyContext::create(
       pool_.clone(),
       ClientBuilder::new(Client::default()).build(),
diff --git a/crates/api_common/src/utils.rs b/crates/api_common/src/utils.rs
index 9810e23901..d754699042 100644
--- a/crates/api_common/src/utils.rs
+++ b/crates/api_common/src/utils.rs
@@ -139,8 +139,8 @@ pub fn is_top_mod(
 #[tracing::instrument(skip_all)]
 pub async fn get_post(post_id: PostId, pool: &mut DbPool<'_>) -> LemmyResult<Post> {
   Post::read(pool, post_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntFindPost)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost.into())
 }
 
 #[tracing::instrument(skip_all)]
@@ -188,8 +188,8 @@ async fn check_community_deleted_removed(
   pool: &mut DbPool<'_>,
 ) -> LemmyResult<()> {
   let community = Community::read(pool, community_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   if community.deleted || community.removed {
     Err(LemmyErrorType::Deleted)?
   }
@@ -660,7 +660,7 @@ pub async fn purge_image_posts_for_person(
 
 /// Delete a local_user's images
 async fn delete_local_user_images(person_id: PersonId, context: &LemmyContext) -> LemmyResult<()> {
-  if let Ok(local_user) = LocalUserView::read_person(&mut context.pool(), person_id).await {
+  if let Ok(Some(local_user)) = LocalUserView::read_person(&mut context.pool(), person_id).await {
     let pictrs_uploads =
       LocalImage::get_all_by_local_user_id(&mut context.pool(), local_user.local_user.id).await?;
 
@@ -700,7 +700,9 @@ pub async fn remove_user_data(
 ) -> LemmyResult<()> {
   let pool = &mut context.pool();
   // Purge user images
-  let person = Person::read(pool, banned_person_id).await?;
+  let person = Person::read(pool, banned_person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
   if let Some(avatar) = person.avatar {
     purge_image_from_pictrs(&avatar, context).await.ok();
   }
@@ -813,7 +815,9 @@ pub async fn remove_user_data_in_community(
 pub async fn purge_user_account(person_id: PersonId, context: &LemmyContext) -> LemmyResult<()> {
   let pool = &mut context.pool();
 
-  let person = Person::read(pool, person_id).await?;
+  let person = Person::read(pool, person_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   // Delete their local images, if they're a local user
   delete_local_user_images(person_id, context).await.ok();
diff --git a/crates/api_crud/src/comment/create.rs b/crates/api_crud/src/comment/create.rs
index 6b1c4ed307..6493d68034 100644
--- a/crates/api_crud/src/comment/create.rs
+++ b/crates/api_crud/src/comment/create.rs
@@ -70,7 +70,8 @@ pub async fn create_comment(
     Comment::read(&mut context.pool(), parent_id).await.ok()
   } else {
     None
-  };
+  }
+  .flatten();
 
   // If there's a parent_id, check to make sure that comment is in that post
   // Strange issue where sometimes the post ID of the parent comment is incorrect
@@ -172,7 +173,7 @@ pub async fn create_comment(
     let parent_id = parent.id;
     let comment_reply =
       CommentReply::read_by_comment_and_person(&mut context.pool(), parent_id, person_id).await;
-    if let Ok(reply) = comment_reply {
+    if let Ok(Some(reply)) = comment_reply {
       CommentReply::update(
         &mut context.pool(),
         reply.id,
@@ -185,7 +186,7 @@ pub async fn create_comment(
     // If the parent has PersonMentions mark them as read too
     let person_mention =
       PersonMention::read_by_comment_and_person(&mut context.pool(), parent_id, person_id).await;
-    if let Ok(mention) = person_mention {
+    if let Ok(Some(mention)) = person_mention {
       PersonMention::update(
         &mut context.pool(),
         mention.id,
diff --git a/crates/api_crud/src/comment/delete.rs b/crates/api_crud/src/comment/delete.rs
index 00a8ea0c16..2b1a20f89c 100644
--- a/crates/api_crud/src/comment/delete.rs
+++ b/crates/api_crud/src/comment/delete.rs
@@ -21,7 +21,9 @@ pub async fn delete_comment(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommentResponse>> {
   let comment_id = data.comment_id;
-  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None).await?;
+  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   // Dont delete it if its already been deleted.
   if orig_comment.comment.deleted == data.deleted {
diff --git a/crates/api_crud/src/comment/remove.rs b/crates/api_crud/src/comment/remove.rs
index 1355a7076c..02ae7b9fd1 100644
--- a/crates/api_crud/src/comment/remove.rs
+++ b/crates/api_crud/src/comment/remove.rs
@@ -25,7 +25,9 @@ pub async fn remove_comment(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommentResponse>> {
   let comment_id = data.comment_id;
-  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None).await?;
+  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_mod_action(
     &local_user_view.person,
diff --git a/crates/api_crud/src/comment/update.rs b/crates/api_crud/src/comment/update.rs
index ff6f788043..695ededfed 100644
--- a/crates/api_crud/src/comment/update.rs
+++ b/crates/api_crud/src/comment/update.rs
@@ -36,7 +36,9 @@ pub async fn update_comment(
   let local_site = LocalSite::read(&mut context.pool()).await?;
 
   let comment_id = data.comment_id;
-  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None).await?;
+  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,
diff --git a/crates/api_crud/src/community/create.rs b/crates/api_crud/src/community/create.rs
index 32d37d8eff..b0b6bea0ee 100644
--- a/crates/api_crud/src/community/create.rs
+++ b/crates/api_crud/src/community/create.rs
@@ -46,7 +46,9 @@ pub async fn create_community(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommunityResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let local_site = site_view.local_site;
 
   if local_site.community_creation_admin_only && is_admin(&local_user_view).is_err() {
diff --git a/crates/api_crud/src/community/list.rs b/crates/api_crud/src/community/list.rs
index 9c13ae89f5..587b5cdfab 100644
--- a/crates/api_crud/src/community/list.rs
+++ b/crates/api_crud/src/community/list.rs
@@ -6,7 +6,7 @@ use lemmy_api_common::{
 };
 use lemmy_db_views::structs::{LocalUserView, SiteView};
 use lemmy_db_views_actor::community_view::CommunityQuery;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn list_communities(
@@ -14,7 +14,9 @@ pub async fn list_communities(
   context: Data<LemmyContext>,
   local_user_view: Option<LocalUserView>,
 ) -> LemmyResult<Json<ListCommunitiesResponse>> {
-  let local_site = SiteView::read_local(&mut context.pool()).await?;
+  let local_site = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let is_admin = local_user_view
     .as_ref()
     .map(|luv| is_admin(luv).is_ok())
diff --git a/crates/api_crud/src/community/update.rs b/crates/api_crud/src/community/update.rs
index bc0945ba14..33c6a47dd1 100644
--- a/crates/api_crud/src/community/update.rs
+++ b/crates/api_crud/src/community/update.rs
@@ -43,7 +43,9 @@ pub async fn update_community(
   let description =
     process_markdown_opt(&data.description, &slur_regex, &url_blocklist, &context).await?;
   is_valid_body_field(&data.description, false)?;
-  let old_community = Community::read(&mut context.pool(), data.community_id).await?;
+  let old_community = Community::read(&mut context.pool(), data.community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   replace_image(&data.icon, &old_community.icon, &context).await?;
   replace_image(&data.banner, &old_community.banner, &context).await?;
 
diff --git a/crates/api_crud/src/post/create.rs b/crates/api_crud/src/post/create.rs
index cea0d5a31d..266f964fa6 100644
--- a/crates/api_crud/src/post/create.rs
+++ b/crates/api_crud/src/post/create.rs
@@ -85,7 +85,9 @@ pub async fn create_post(
   .await?;
 
   let community_id = data.community_id;
-  let community = Community::read(&mut context.pool(), community_id).await?;
+  let community = Community::read(&mut context.pool(), community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   if community.posting_restricted_to_mods {
     let community_id = data.community_id;
     let is_mod = CommunityModeratorView::is_community_moderator(
diff --git a/crates/api_crud/src/post/delete.rs b/crates/api_crud/src/post/delete.rs
index e07ff7723e..696566c8e4 100644
--- a/crates/api_crud/src/post/delete.rs
+++ b/crates/api_crud/src/post/delete.rs
@@ -21,7 +21,9 @@ pub async fn delete_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let orig_post = Post::read(&mut context.pool(), post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   // Dont delete it if its already been deleted.
   if orig_post.deleted == data.deleted {
diff --git a/crates/api_crud/src/post/read.rs b/crates/api_crud/src/post/read.rs
index cb4ba7e9f1..2a567187f7 100644
--- a/crates/api_crud/src/post/read.rs
+++ b/crates/api_crud/src/post/read.rs
@@ -22,7 +22,9 @@ pub async fn get_post(
   context: Data<LemmyContext>,
   local_user_view: Option<LocalUserView>,
 ) -> LemmyResult<Json<GetPostResponse>> {
-  let local_site = SiteView::read_local(&mut context.pool()).await?;
+  let local_site = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   check_private_instance(&local_user_view, &local_site.local_site)?;
 
@@ -33,15 +35,19 @@ pub async fn get_post(
     id
   } else if let Some(comment_id) = data.comment_id {
     Comment::read(&mut context.pool(), comment_id)
-      .await
-      .with_lemmy_type(LemmyErrorType::CouldntFindPost)?
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindComment)?
       .post_id
   } else {
     Err(LemmyErrorType::CouldntFindPost)?
   };
 
   // Check to see if the person is a mod or admin, to show deleted / removed
-  let community_id = Post::read(&mut context.pool(), post_id).await?.community_id;
+  let community_id = Post::read(&mut context.pool(), post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?
+    .community_id;
+
   let is_mod_or_admin = is_mod_or_admin_opt(
     &mut context.pool(),
     local_user_view.as_ref(),
@@ -51,8 +57,8 @@ pub async fn get_post(
   .is_ok();
 
   let post_view = PostView::read(&mut context.pool(), post_id, person_id, is_mod_or_admin)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntFindPost)?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   // Mark the post as read
   let post_id = post_view.post.id;
@@ -67,8 +73,8 @@ pub async fn get_post(
     person_id,
     is_mod_or_admin,
   )
-  .await
-  .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?;
+  .await?
+  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   // Insert into PersonPostAggregates
   // to update the read_comments count
diff --git a/crates/api_crud/src/post/remove.rs b/crates/api_crud/src/post/remove.rs
index 37f3f61484..682ed75d3f 100644
--- a/crates/api_crud/src/post/remove.rs
+++ b/crates/api_crud/src/post/remove.rs
@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   traits::{Crud, Reportable},
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn remove_post(
@@ -25,7 +25,9 @@ pub async fn remove_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let orig_post = Post::read(&mut context.pool(), post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_mod_action(
     &local_user_view.person,
diff --git a/crates/api_crud/src/post/update.rs b/crates/api_crud/src/post/update.rs
index 48a1b6523b..8be97f3c11 100644
--- a/crates/api_crud/src/post/update.rs
+++ b/crates/api_crud/src/post/update.rs
@@ -70,7 +70,9 @@ pub async fn update_post(
   check_url_scheme(&custom_thumbnail)?;
 
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let orig_post = Post::read(&mut context.pool(), post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_user_action(
     &local_user_view.person,
diff --git a/crates/api_crud/src/private_message/create.rs b/crates/api_crud/src/private_message/create.rs
index 1fe4f9b488..e977a6c866 100644
--- a/crates/api_crud/src/private_message/create.rs
+++ b/crates/api_crud/src/private_message/create.rs
@@ -76,12 +76,16 @@ pub async fn create_private_message(
   .await
   .with_lemmy_type(LemmyErrorType::CouldntCreatePrivateMessage)?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), inserted_private_message.id).await?;
+  let view = PrivateMessageView::read(&mut context.pool(), inserted_private_message.id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
 
   // Send email to the local recipient, if one exists
   if view.recipient.local {
     let recipient_id = data.recipient_id;
-    let local_recipient = LocalUserView::read_person(&mut context.pool(), recipient_id).await?;
+    let local_recipient = LocalUserView::read_person(&mut context.pool(), recipient_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?;
     let lang = get_interface_language(&local_recipient);
     let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname());
     let sender_name = &local_user_view.person.name;
diff --git a/crates/api_crud/src/private_message/delete.rs b/crates/api_crud/src/private_message/delete.rs
index 936ff57b80..dc028ff410 100644
--- a/crates/api_crud/src/private_message/delete.rs
+++ b/crates/api_crud/src/private_message/delete.rs
@@ -20,7 +20,9 @@ pub async fn delete_private_message(
 ) -> LemmyResult<Json<PrivateMessageResponse>> {
   // Checking permissions
   let private_message_id = data.private_message_id;
-  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
+  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   if local_user_view.person.id != orig_private_message.creator_id {
     Err(LemmyErrorType::EditPrivateMessageNotAllowed)?
   }
@@ -45,7 +47,9 @@ pub async fn delete_private_message(
   )
   .await?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
+  let view = PrivateMessageView::read(&mut context.pool(), private_message_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   Ok(Json(PrivateMessageResponse {
     private_message_view: view,
   }))
diff --git a/crates/api_crud/src/private_message/update.rs b/crates/api_crud/src/private_message/update.rs
index 765a330537..2842fea659 100644
--- a/crates/api_crud/src/private_message/update.rs
+++ b/crates/api_crud/src/private_message/update.rs
@@ -30,7 +30,9 @@ pub async fn update_private_message(
 
   // Checking permissions
   let private_message_id = data.private_message_id;
-  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
+  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   if local_user_view.person.id != orig_private_message.creator_id {
     Err(LemmyErrorType::EditPrivateMessageNotAllowed)?
   }
@@ -54,7 +56,9 @@ pub async fn update_private_message(
   .await
   .with_lemmy_type(LemmyErrorType::CouldntUpdatePrivateMessage)?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
+  let view = PrivateMessageView::read(&mut context.pool(), private_message_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
 
   ActivityChannel::submit_activity(
     SendActivityData::UpdatePrivateMessage(view.clone()),
diff --git a/crates/api_crud/src/site/create.rs b/crates/api_crud/src/site/create.rs
index 1c2fed3ede..466c7ff1d7 100644
--- a/crates/api_crud/src/site/create.rs
+++ b/crates/api_crud/src/site/create.rs
@@ -129,7 +129,9 @@ pub async fn create_site(
 
   LocalSiteRateLimit::update(&mut context.pool(), &local_site_rate_limit_form).await?;
 
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   let new_taglines = data.taglines.clone();
   let taglines = Tagline::replace(&mut context.pool(), local_site.id, new_taglines).await?;
diff --git a/crates/api_crud/src/site/read.rs b/crates/api_crud/src/site/read.rs
index c8ad866a3d..69e82007ce 100644
--- a/crates/api_crud/src/site/read.rs
+++ b/crates/api_crud/src/site/read.rs
@@ -41,7 +41,9 @@ pub async fn get_site(
   // This data is independent from the user account so we can cache it across requests
   let mut site_response = CACHE
     .try_get_with::<_, LemmyError>((), async {
-      let site_view = SiteView::read_local(&mut context.pool()).await?;
+      let site_view = SiteView::read_local(&mut context.pool())
+        .await?
+        .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
       let admins = PersonView::admins(&mut context.pool()).await?;
       let all_languages = Language::read_all(&mut context.pool()).await?;
       let discussion_languages = SiteLanguage::read_local_raw(&mut context.pool()).await?;
diff --git a/crates/api_crud/src/site/update.rs b/crates/api_crud/src/site/update.rs
index adf44fad48..7b44b92a6b 100644
--- a/crates/api_crud/src/site/update.rs
+++ b/crates/api_crud/src/site/update.rs
@@ -52,7 +52,9 @@ pub async fn update_site(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<SiteResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let local_site = site_view.local_site;
   let site = site_view.site;
 
@@ -181,7 +183,9 @@ pub async fn update_site(
   let new_taglines = data.taglines.clone();
   let taglines = Tagline::replace(&mut context.pool(), local_site.id, new_taglines).await?;
 
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   let rate_limit_config =
     local_site_rate_limit_to_rate_limit_config(&site_view.local_site_rate_limit);
diff --git a/crates/api_crud/src/user/create.rs b/crates/api_crud/src/user/create.rs
index 1f81d4324c..6640e9e538 100644
--- a/crates/api_crud/src/user/create.rs
+++ b/crates/api_crud/src/user/create.rs
@@ -45,7 +45,9 @@ pub async fn register(
   req: HttpRequest,
   context: Data<LemmyContext>,
 ) -> LemmyResult<Json<LoginResponse>> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let local_site = site_view.local_site;
   let require_registration_application =
     local_site.registration_mode == RegistrationMode::RequireApplication;
diff --git a/crates/apub/src/activities/block/mod.rs b/crates/apub/src/activities/block/mod.rs
index 51d8bf5e02..ced50e2def 100644
--- a/crates/apub/src/activities/block/mod.rs
+++ b/crates/apub/src/activities/block/mod.rs
@@ -23,7 +23,10 @@ use lemmy_db_schema::{
   utils::DbPool,
 };
 use lemmy_db_views::structs::SiteView;
-use lemmy_utils::error::{LemmyError, LemmyResult};
+use lemmy_utils::{
+  error::{LemmyError, LemmyResult},
+  LemmyErrorType,
+};
 use serde::Deserialize;
 use url::Url;
 
@@ -134,7 +137,13 @@ pub(crate) async fn send_ban_from_site(
   expires: Option<i64>,
   context: Data<LemmyContext>,
 ) -> LemmyResult<()> {
-  let site = SiteOrCommunity::Site(SiteView::read_local(&mut context.pool()).await?.site.into());
+  let site = SiteOrCommunity::Site(
+    SiteView::read_local(&mut context.pool())
+      .await?
+      .ok_or(LemmyErrorType::LocalSiteNotSetup)?
+      .site
+      .into(),
+  );
   let expires = check_expire_time(expires)?;
 
   // if the action affects a local user, federate to other instances
@@ -174,6 +183,7 @@ pub(crate) async fn send_ban_from_community(
 ) -> LemmyResult<()> {
   let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
     .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   let expires = check_expire_time(data.expires)?;
 
diff --git a/crates/apub/src/activities/community/collection_add.rs b/crates/apub/src/activities/community/collection_add.rs
index 34c46cf6bc..3d5de41283 100644
--- a/crates/apub/src/activities/community/collection_add.rs
+++ b/crates/apub/src/activities/community/collection_add.rs
@@ -36,7 +36,10 @@ use lemmy_db_schema::{
   },
   traits::{Crud, Joinable},
 };
-use lemmy_utils::error::{LemmyError, LemmyResult};
+use lemmy_utils::{
+  error::{LemmyError, LemmyResult},
+  LemmyErrorType,
+};
 use url::Url;
 
 impl CollectionAdd {
@@ -126,7 +129,9 @@ impl ActivityHandler for CollectionAdd {
   async fn receive(self, context: &Data<Self::DataType>) -> LemmyResult<()> {
     insert_received_activity(&self.id, context).await?;
     let (community, collection_type) =
-      Community::get_by_collection_url(&mut context.pool(), &self.target.into()).await?;
+      Community::get_by_collection_url(&mut context.pool(), &self.target.into())
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     match collection_type {
       CollectionType::Moderators => {
         let new_mod = ObjectId::<ApubPerson>::from(self.object)
@@ -183,9 +188,11 @@ pub(crate) async fn send_add_mod_to_community(
   let actor: ApubPerson = actor.into();
   let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
     .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   let updated_mod: ApubPerson = Person::read(&mut context.pool(), updated_mod_id)
     .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?
     .into();
   if added {
     CollectionAdd::send_add_mod(&community, &updated_mod, &actor, &context).await
@@ -204,6 +211,7 @@ pub(crate) async fn send_feature_post(
   let post: ApubPost = post.into();
   let community = Community::read(&mut context.pool(), post.community_id)
     .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   if featured {
     CollectionAdd::send_add_featured_post(&community, &post, &actor, &context).await
diff --git a/crates/apub/src/activities/community/collection_remove.rs b/crates/apub/src/activities/community/collection_remove.rs
index 90df1fd140..634ca526c4 100644
--- a/crates/apub/src/activities/community/collection_remove.rs
+++ b/crates/apub/src/activities/community/collection_remove.rs
@@ -31,7 +31,10 @@ use lemmy_db_schema::{
   },
   traits::{Crud, Joinable},
 };
-use lemmy_utils::error::{LemmyError, LemmyResult};
+use lemmy_utils::{
+  error::{LemmyError, LemmyResult},
+  LemmyErrorType,
+};
 use url::Url;
 
 impl CollectionRemove {
@@ -121,7 +124,9 @@ impl ActivityHandler for CollectionRemove {
   async fn receive(self, context: &Data<Self::DataType>) -> LemmyResult<()> {
     insert_received_activity(&self.id, context).await?;
     let (community, collection_type) =
-      Community::get_by_collection_url(&mut context.pool(), &self.target.into()).await?;
+      Community::get_by_collection_url(&mut context.pool(), &self.target.into())
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     match collection_type {
       CollectionType::Moderators => {
         let remove_mod = ObjectId::<ApubPerson>::from(self.object)
diff --git a/crates/apub/src/activities/community/lock_page.rs b/crates/apub/src/activities/community/lock_page.rs
index ba3e164177..bafb42a4ab 100644
--- a/crates/apub/src/activities/community/lock_page.rs
+++ b/crates/apub/src/activities/community/lock_page.rs
@@ -31,7 +31,10 @@ use lemmy_db_schema::{
   },
   traits::Crud,
 };
-use lemmy_utils::error::{LemmyError, LemmyResult};
+use lemmy_utils::{
+  error::{LemmyError, LemmyResult},
+  LemmyErrorType,
+};
 use url::Url;
 
 #[async_trait::async_trait]
@@ -109,6 +112,7 @@ pub(crate) async fn send_lock_post(
 ) -> LemmyResult<()> {
   let community: ApubCommunity = Community::read(&mut context.pool(), post.community_id)
     .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   let id = generate_activity_id(
     LockType::Lock,
diff --git a/crates/apub/src/activities/community/report.rs b/crates/apub/src/activities/community/report.rs
index 4966add341..d1bec0b754 100644
--- a/crates/apub/src/activities/community/report.rs
+++ b/crates/apub/src/activities/community/report.rs
@@ -29,7 +29,10 @@ use lemmy_db_schema::{
   },
   traits::{Crud, Reportable},
 };
-use lemmy_utils::error::{LemmyError, LemmyResult};
+use lemmy_utils::{
+  error::{LemmyError, LemmyResult},
+  LemmyErrorType,
+};
 use url::Url;
 
 impl Report {
@@ -67,7 +70,9 @@ impl Report {
       PostOrComment::Post(p) => p.creator_id,
       PostOrComment::Comment(c) => c.creator_id,
     };
-    let object_creator = Person::read(&mut context.pool(), object_creator_id).await?;
+    let object_creator = Person::read(&mut context.pool(), object_creator_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?;
     let object_creator_site: Option<ApubSite> =
       Site::read_from_instance_id(&mut context.pool(), object_creator.instance_id)
         .await?
diff --git a/crates/apub/src/activities/create_or_update/comment.rs b/crates/apub/src/activities/create_or_update/comment.rs
index 8fbbe42b36..7f15320871 100644
--- a/crates/apub/src/activities/create_or_update/comment.rs
+++ b/crates/apub/src/activities/create_or_update/comment.rs
@@ -42,6 +42,7 @@ use lemmy_db_schema::{
 use lemmy_utils::{
   error::{LemmyError, LemmyResult},
   utils::mention::scrape_text_for_mentions,
+  LemmyErrorType,
 };
 use url::Url;
 
@@ -55,11 +56,17 @@ impl CreateOrUpdateNote {
   ) -> LemmyResult<()> {
     // TODO: might be helpful to add a comment method to retrieve community directly
     let post_id = comment.post_id;
-    let post = Post::read(&mut context.pool(), post_id).await?;
+    let post = Post::read(&mut context.pool(), post_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPost)?;
     let community_id = post.community_id;
-    let person: ApubPerson = Person::read(&mut context.pool(), person_id).await?.into();
+    let person: ApubPerson = Person::read(&mut context.pool(), person_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?
+      .into();
     let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
       .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
 
     let id = generate_activity_id(
diff --git a/crates/apub/src/activities/create_or_update/post.rs b/crates/apub/src/activities/create_or_update/post.rs
index eb59e054a4..2ca7e52ccf 100644
--- a/crates/apub/src/activities/create_or_update/post.rs
+++ b/crates/apub/src/activities/create_or_update/post.rs
@@ -68,9 +68,13 @@ impl CreateOrUpdatePage {
   ) -> LemmyResult<()> {
     let post = ApubPost(post);
     let community_id = post.community_id;
-    let person: ApubPerson = Person::read(&mut context.pool(), person_id).await?.into();
+    let person: ApubPerson = Person::read(&mut context.pool(), person_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?
+      .into();
     let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
       .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
 
     let create_or_update =
diff --git a/crates/apub/src/activities/deletion/mod.rs b/crates/apub/src/activities/deletion/mod.rs
index b12532087e..c9d268e749 100644
--- a/crates/apub/src/activities/deletion/mod.rs
+++ b/crates/apub/src/activities/deletion/mod.rs
@@ -39,7 +39,7 @@ use lemmy_db_schema::{
   },
   traits::Crud,
 };
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use std::ops::Deref;
 use url::Url;
 
@@ -87,6 +87,7 @@ pub(crate) async fn send_apub_delete_private_message(
   let recipient_id = pm.recipient_id;
   let recipient: ApubPerson = Person::read(&mut context.pool(), recipient_id)
     .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?
     .into();
 
   let deletable = DeletableObjects::PrivateMessage(pm.into());
diff --git a/crates/apub/src/activities/mod.rs b/crates/apub/src/activities/mod.rs
index 6547b957d1..d81e7cabf3 100644
--- a/crates/apub/src/activities/mod.rs
+++ b/crates/apub/src/activities/mod.rs
@@ -245,7 +245,9 @@ pub async fn match_outgoing_activities(
         CreateOrUpdatePage::send(post, creator_id, CreateOrUpdateType::Update, context).await
       }
       DeletePost(post, person, data) => {
-        let community = Community::read(&mut context.pool(), post.community_id).await?;
+        let community = Community::read(&mut context.pool(), post.community_id)
+          .await?
+          .ok_or(LemmyErrorType::CouldntFindCommunity)?;
         send_apub_delete_in_community(
           person,
           community,
@@ -262,7 +264,9 @@ pub async fn match_outgoing_activities(
         reason,
         removed,
       } => {
-        let community = Community::read(&mut context.pool(), post.community_id).await?;
+        let community = Community::read(&mut context.pool(), post.community_id)
+          .await?
+          .ok_or(LemmyErrorType::CouldntFindCommunity)?;
         send_apub_delete_in_community(
           moderator,
           community,
diff --git a/crates/apub/src/api/list_comments.rs b/crates/apub/src/api/list_comments.rs
index a231b90800..25d1970079 100644
--- a/crates/apub/src/api/list_comments.rs
+++ b/crates/apub/src/api/list_comments.rs
@@ -58,7 +58,12 @@ pub async fn list_comments(
 
   // If a parent_id is given, fetch the comment to get the path
   let parent_path = if let Some(parent_id) = parent_id {
-    Some(Comment::read(&mut context.pool(), parent_id).await?.path)
+    Some(
+      Comment::read(&mut context.pool(), parent_id)
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindComment)?
+        .path,
+    )
   } else {
     None
   };
diff --git a/crates/apub/src/api/list_posts.rs b/crates/apub/src/api/list_posts.rs
index 87e4bc6792..ec5412de8d 100644
--- a/crates/apub/src/api/list_posts.rs
+++ b/crates/apub/src/api/list_posts.rs
@@ -23,7 +23,9 @@ pub async fn list_posts(
   context: Data<LemmyContext>,
   local_user_view: Option<LocalUserView>,
 ) -> LemmyResult<Json<GetPostsResponse>> {
-  let local_site = SiteView::read_local(&mut context.pool()).await?;
+  let local_site = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   check_private_instance(&local_user_view, &local_site.local_site)?;
 
diff --git a/crates/apub/src/api/read_community.rs b/crates/apub/src/api/read_community.rs
index 0d32a0b490..dae7719ae8 100644
--- a/crates/apub/src/api/read_community.rs
+++ b/crates/apub/src/api/read_community.rs
@@ -56,8 +56,8 @@ pub async fn get_community(
     person_id,
     is_mod_or_admin,
   )
-  .await
-  .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?;
+  .await?
+  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id)
     .await
diff --git a/crates/apub/src/api/read_person.rs b/crates/apub/src/api/read_person.rs
index d4015f62da..0d65ab4f71 100644
--- a/crates/apub/src/api/read_person.rs
+++ b/crates/apub/src/api/read_person.rs
@@ -26,7 +26,9 @@ pub async fn read_person(
     Err(LemmyErrorType::NoIdGiven)?
   }
 
-  let local_site = SiteView::read_local(&mut context.pool()).await?;
+  let local_site = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   check_private_instance(&local_user_view, &local_site.local_site)?;
 
@@ -46,7 +48,9 @@ pub async fn read_person(
 
   // You don't need to return settings for the user, since this comes back with GetSite
   // `my_user`
-  let person_view = PersonView::read(&mut context.pool(), person_details_id).await?;
+  let person_view = PersonView::read(&mut context.pool(), person_details_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   let sort = data.sort;
   let page = data.page;
diff --git a/crates/apub/src/api/resolve_object.rs b/crates/apub/src/api/resolve_object.rs
index 6ab98a0522..47f6c5d068 100644
--- a/crates/apub/src/api/resolve_object.rs
+++ b/crates/apub/src/api/resolve_object.rs
@@ -53,20 +53,36 @@ async fn convert_response(
   match object {
     Post(p) => {
       removed_or_deleted = p.deleted || p.removed;
-      res.post = Some(PostView::read(pool, p.id, user_id, false).await?)
+      res.post = Some(
+        PostView::read(pool, p.id, user_id, false)
+          .await?
+          .ok_or(LemmyErrorType::CouldntFindPost)?,
+      )
     }
     Comment(c) => {
       removed_or_deleted = c.deleted || c.removed;
-      res.comment = Some(CommentView::read(pool, c.id, user_id).await?)
+      res.comment = Some(
+        CommentView::read(pool, c.id, user_id)
+          .await?
+          .ok_or(LemmyErrorType::CouldntFindComment)?,
+      )
     }
     PersonOrCommunity(p) => match *p {
       UserOrCommunity::User(u) => {
         removed_or_deleted = u.deleted;
-        res.person = Some(PersonView::read(pool, u.id).await?)
+        res.person = Some(
+          PersonView::read(pool, u.id)
+            .await?
+            .ok_or(LemmyErrorType::CouldntFindPerson)?,
+        )
       }
       UserOrCommunity::Community(c) => {
         removed_or_deleted = c.deleted || c.removed;
-        res.community = Some(CommunityView::read(pool, c.id, user_id, false).await?)
+        res.community = Some(
+          CommunityView::read(pool, c.id, user_id, false)
+            .await?
+            .ok_or(LemmyErrorType::CouldntFindCommunity)?,
+        )
       }
     },
   };
diff --git a/crates/apub/src/api/search.rs b/crates/apub/src/api/search.rs
index 0cac8351ac..f3cd36faf7 100644
--- a/crates/apub/src/api/search.rs
+++ b/crates/apub/src/api/search.rs
@@ -13,7 +13,7 @@ use lemmy_db_views::{
   structs::{LocalUserView, SiteView},
 };
 use lemmy_db_views_actor::{community_view::CommunityQuery, person_view::PersonQuery};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 #[tracing::instrument(skip(context))]
 pub async fn search(
@@ -21,7 +21,9 @@ pub async fn search(
   context: Data<LemmyContext>,
   local_user_view: Option<LocalUserView>,
 ) -> LemmyResult<Json<SearchResponse>> {
-  let local_site = SiteView::read_local(&mut context.pool()).await?;
+  let local_site = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   check_private_instance(&local_user_view, &local_site.local_site)?;
 
diff --git a/crates/apub/src/api/user_settings_backup.rs b/crates/apub/src/api/user_settings_backup.rs
index 8053d66a01..57e1d0f972 100644
--- a/crates/apub/src/api/user_settings_backup.rs
+++ b/crates/apub/src/api/user_settings_backup.rs
@@ -363,7 +363,11 @@ mod tests {
       .build();
     let local_user = LocalUser::create(&mut context.pool(), &user_form, vec![]).await?;
 
-    Ok(LocalUserView::read(&mut context.pool(), local_user.id).await?)
+    Ok(
+      LocalUserView::read(&mut context.pool(), local_user.id)
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindLocalUser)?,
+    )
   }
 
   #[tokio::test]
@@ -396,8 +400,9 @@ mod tests {
     // wait for background task to finish
     sleep(Duration::from_millis(1000)).await;
 
-    let import_user_updated =
-      LocalUserView::read(&mut context.pool(), import_user.local_user.id).await?;
+    let import_user_updated = LocalUserView::read(&mut context.pool(), import_user.local_user.id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindLocalUser)?;
 
     assert_eq!(
       export_user.person.display_name,
diff --git a/crates/apub/src/collections/community_outbox.rs b/crates/apub/src/collections/community_outbox.rs
index f56708d099..71985f946d 100644
--- a/crates/apub/src/collections/community_outbox.rs
+++ b/crates/apub/src/collections/community_outbox.rs
@@ -23,7 +23,10 @@ use lemmy_db_schema::{
   traits::Crud,
   utils::FETCH_LIMIT_MAX,
 };
-use lemmy_utils::error::{LemmyError, LemmyResult};
+use lemmy_utils::{
+  error::{LemmyError, LemmyResult},
+  LemmyErrorType,
+};
 use url::Url;
 
 #[derive(Clone, Debug)]
@@ -47,6 +50,7 @@ impl Collection for ApubCommunityOutbox {
     for post in post_list {
       let person = Person::read(&mut data.pool(), post.creator_id)
         .await?
+        .ok_or(LemmyErrorType::CouldntFindPerson)?
         .into();
       let create =
         CreateOrUpdatePage::new(post, &person, owner, CreateOrUpdateType::Create, data).await?;
diff --git a/crates/apub/src/fetcher/mod.rs b/crates/apub/src/fetcher/mod.rs
index 9286569240..68fc07d305 100644
--- a/crates/apub/src/fetcher/mod.rs
+++ b/crates/apub/src/fetcher/mod.rs
@@ -42,9 +42,12 @@ where
       .splitn(2, '@')
       .collect_tuple()
       .expect("invalid query");
-    let actor = DbActor::read_from_name_and_domain(&mut context.pool(), name, domain).await;
-    if actor.is_ok() {
-      Ok(actor?.into())
+    let actor = DbActor::read_from_name_and_domain(&mut context.pool(), name, domain)
+      .await
+      .ok()
+      .flatten();
+    if let Some(actor) = actor {
+      Ok(actor.into())
     } else if local_user_view.is_some() {
       // Fetch the actor from its home instance using webfinger
       let actor: ActorType = webfinger_resolve_actor(&identifier.to_lowercase(), context).await?;
@@ -59,6 +62,7 @@ where
     Ok(
       DbActor::read_from_name(&mut context.pool(), &identifier, include_deleted)
         .await?
+        .ok_or(NotFound)?
         .into(),
     )
   }
diff --git a/crates/apub/src/fetcher/post_or_comment.rs b/crates/apub/src/fetcher/post_or_comment.rs
index 9df0a04fbf..083369b9d1 100644
--- a/crates/apub/src/fetcher/post_or_comment.rs
+++ b/crates/apub/src/fetcher/post_or_comment.rs
@@ -12,7 +12,10 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::error::{LemmyError, LemmyResult};
+use lemmy_utils::{
+  error::{LemmyError, LemmyResult},
+  LemmyErrorType,
+};
 use serde::Deserialize;
 use url::Url;
 
@@ -91,9 +94,15 @@ impl InCommunity for PostOrComment {
       PostOrComment::Comment(c) => {
         Post::read(&mut context.pool(), c.post_id)
           .await?
+          .ok_or(LemmyErrorType::CouldntFindPost)?
           .community_id
       }
     };
-    Ok(Community::read(&mut context.pool(), cid).await?.into())
+    Ok(
+      Community::read(&mut context.pool(), cid)
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindCommunity)?
+        .into(),
+    )
   }
 }
diff --git a/crates/apub/src/http/comment.rs b/crates/apub/src/http/comment.rs
index d6b3c818da..17711817e3 100644
--- a/crates/apub/src/http/comment.rs
+++ b/crates/apub/src/http/comment.rs
@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   source::{comment::Comment, community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
@@ -31,9 +31,16 @@ pub(crate) async fn get_apub_comment(
 ) -> LemmyResult<HttpResponse> {
   let id = CommentId(info.comment_id.parse::<i32>()?);
   // Can't use CommentView here because it excludes deleted/removed/local-only items
-  let comment: ApubComment = Comment::read(&mut context.pool(), id).await?.into();
-  let post = Post::read(&mut context.pool(), comment.post_id).await?;
-  let community = Community::read(&mut context.pool(), post.community_id).await?;
+  let comment: ApubComment = Comment::read(&mut context.pool(), id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?
+    .into();
+  let post = Post::read(&mut context.pool(), comment.post_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
+  let community = Community::read(&mut context.pool(), post.community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   check_community_public(&community)?;
 
   if !comment.local {
diff --git a/crates/apub/src/http/community.rs b/crates/apub/src/http/community.rs
index 2085ed1ac3..c7a1f9eda5 100644
--- a/crates/apub/src/http/community.rs
+++ b/crates/apub/src/http/community.rs
@@ -18,7 +18,7 @@ use activitypub_federation::{
 use actix_web::{web, web::Bytes, HttpRequest, HttpResponse};
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{source::community::Community, traits::ApubActor};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::Deserialize;
 
 #[derive(Deserialize, Clone)]
@@ -35,6 +35,7 @@ pub(crate) async fn get_apub_community_http(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, true)
       .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
 
   if community.deleted || community.removed {
@@ -64,8 +65,9 @@ pub(crate) async fn get_apub_community_followers(
   info: web::Path<CommunityQuery>,
   context: Data<LemmyContext>,
 ) -> LemmyResult<HttpResponse> {
-  let community =
-    Community::read_from_name(&mut context.pool(), &info.community_name, false).await?;
+  let community = Community::read_from_name(&mut context.pool(), &info.community_name, false)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   check_community_public(&community)?;
   let followers = ApubCommunityFollower::read_local(&community.into(), &context).await?;
   create_apub_response(&followers)
@@ -80,6 +82,7 @@ pub(crate) async fn get_apub_community_outbox(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, false)
       .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
   check_community_public(&community)?;
   let outbox = ApubCommunityOutbox::read_local(&community, &context).await?;
@@ -94,6 +97,7 @@ pub(crate) async fn get_apub_community_moderators(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, false)
       .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
   check_community_public(&community)?;
   let moderators = ApubCommunityModerators::read_local(&community, &context).await?;
@@ -108,6 +112,7 @@ pub(crate) async fn get_apub_community_featured(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, false)
       .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
   check_community_public(&community)?;
   let featured = ApubCommunityFeatured::read_local(&community, &context).await?;
diff --git a/crates/apub/src/http/mod.rs b/crates/apub/src/http/mod.rs
index 86c51338a9..8aba7832f1 100644
--- a/crates/apub/src/http/mod.rs
+++ b/crates/apub/src/http/mod.rs
@@ -97,7 +97,9 @@ pub(crate) async fn get_activity(
     info.id
   ))?
   .into();
-  let activity = SentActivity::read_from_apub_id(&mut context.pool(), &activity_id).await?;
+  let activity = SentActivity::read_from_apub_id(&mut context.pool(), &activity_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindActivity)?;
 
   let sensitive = activity.sensitive;
   if sensitive {
diff --git a/crates/apub/src/http/person.rs b/crates/apub/src/http/person.rs
index b34f166b04..ba2372fe89 100644
--- a/crates/apub/src/http/person.rs
+++ b/crates/apub/src/http/person.rs
@@ -14,7 +14,7 @@ use activitypub_federation::{
 use actix_web::{web, web::Bytes, HttpRequest, HttpResponse};
 use lemmy_api_common::{context::LemmyContext, utils::generate_outbox_url};
 use lemmy_db_schema::{source::person::Person, traits::ApubActor};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
@@ -32,6 +32,7 @@ pub(crate) async fn get_apub_person_http(
   // TODO: this needs to be able to read deleted persons, so that it can send tombstones
   let person: ApubPerson = Person::read_from_name(&mut context.pool(), &user_name, true)
     .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?
     .into();
 
   if !person.deleted {
@@ -60,7 +61,9 @@ pub(crate) async fn get_apub_person_outbox(
   info: web::Path<PersonQuery>,
   context: Data<LemmyContext>,
 ) -> LemmyResult<HttpResponse> {
-  let person = Person::read_from_name(&mut context.pool(), &info.user_name, false).await?;
+  let person = Person::read_from_name(&mut context.pool(), &info.user_name, false)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
   let outbox_id = generate_outbox_url(&person.actor_id)?.into();
   let outbox = EmptyOutbox::new(outbox_id)?;
   create_apub_response(&outbox)
diff --git a/crates/apub/src/http/post.rs b/crates/apub/src/http/post.rs
index ce66128262..513cba7ea1 100644
--- a/crates/apub/src/http/post.rs
+++ b/crates/apub/src/http/post.rs
@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
@@ -31,8 +31,13 @@ pub(crate) async fn get_apub_post(
 ) -> LemmyResult<HttpResponse> {
   let id = PostId(info.post_id.parse::<i32>()?);
   // Can't use PostView here because it excludes deleted/removed/local-only items
-  let post: ApubPost = Post::read(&mut context.pool(), id).await?.into();
-  let community = Community::read(&mut context.pool(), post.community_id).await?;
+  let post: ApubPost = Post::read(&mut context.pool(), id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?
+    .into();
+  let community = Community::read(&mut context.pool(), post.community_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   check_community_public(&community)?;
 
   if !post.local {
diff --git a/crates/apub/src/http/site.rs b/crates/apub/src/http/site.rs
index 622c0f676d..54d3c0e320 100644
--- a/crates/apub/src/http/site.rs
+++ b/crates/apub/src/http/site.rs
@@ -7,11 +7,15 @@ use activitypub_federation::{config::Data, traits::Object};
 use actix_web::HttpResponse;
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_views::structs::SiteView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use url::Url;
 
 pub(crate) async fn get_apub_site_http(context: Data<LemmyContext>) -> LemmyResult<HttpResponse> {
-  let site: ApubSite = SiteView::read_local(&mut context.pool()).await?.site.into();
+  let site: ApubSite = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?
+    .site
+    .into();
 
   let apub = site.into_json(&context).await?;
   create_apub_response(&apub)
diff --git a/crates/apub/src/mentions.rs b/crates/apub/src/mentions.rs
index 92b07db8ec..4f4edc76d9 100644
--- a/crates/apub/src/mentions.rs
+++ b/crates/apub/src/mentions.rs
@@ -11,7 +11,7 @@ use lemmy_db_schema::{
   traits::Crud,
   utils::DbPool,
 };
-use lemmy_utils::{error::LemmyResult, utils::mention::scrape_text_for_mentions};
+use lemmy_utils::{error::LemmyResult, utils::mention::scrape_text_for_mentions, LemmyErrorType};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use url::Url;
@@ -96,12 +96,21 @@ async fn get_comment_parent_creator(
   comment: &Comment,
 ) -> LemmyResult<ApubPerson> {
   let parent_creator_id = if let Some(parent_comment_id) = comment.parent_comment_id() {
-    let parent_comment = Comment::read(pool, parent_comment_id).await?;
+    let parent_comment = Comment::read(pool, parent_comment_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindComment)?;
     parent_comment.creator_id
   } else {
     let parent_post_id = comment.post_id;
-    let parent_post = Post::read(pool, parent_post_id).await?;
+    let parent_post = Post::read(pool, parent_post_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPost)?;
     parent_post.creator_id
   };
-  Ok(Person::read(pool, parent_creator_id).await?.into())
+  Ok(
+    Person::read(pool, parent_creator_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?
+      .into(),
+  )
 }
diff --git a/crates/apub/src/objects/comment.rs b/crates/apub/src/objects/comment.rs
index ce0430cc0d..02de96f204 100644
--- a/crates/apub/src/objects/comment.rs
+++ b/crates/apub/src/objects/comment.rs
@@ -91,15 +91,23 @@ impl Object for ApubComment {
   #[tracing::instrument(skip_all)]
   async fn into_json(self, context: &Data<Self::DataType>) -> LemmyResult<Note> {
     let creator_id = self.creator_id;
-    let creator = Person::read(&mut context.pool(), creator_id).await?;
+    let creator = Person::read(&mut context.pool(), creator_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
     let post_id = self.post_id;
-    let post = Post::read(&mut context.pool(), post_id).await?;
+    let post = Post::read(&mut context.pool(), post_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPost)?;
     let community_id = post.community_id;
-    let community = Community::read(&mut context.pool(), community_id).await?;
+    let community = Community::read(&mut context.pool(), community_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
     let in_reply_to = if let Some(comment_id) = self.parent_comment_id() {
-      let parent_comment = Comment::read(&mut context.pool(), comment_id).await?;
+      let parent_comment = Comment::read(&mut context.pool(), comment_id)
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindComment)?;
       parent_comment.ap_id.into()
     } else {
       post.ap_id.into()
diff --git a/crates/apub/src/objects/post.rs b/crates/apub/src/objects/post.rs
index 55af850e57..c7fa4acb17 100644
--- a/crates/apub/src/objects/post.rs
+++ b/crates/apub/src/objects/post.rs
@@ -45,7 +45,7 @@ use lemmy_db_schema::{
 };
 use lemmy_db_views_actor::structs::CommunityModeratorView;
 use lemmy_utils::{
-  error::{LemmyError, LemmyResult},
+  error::{LemmyError, LemmyErrorType, LemmyResult},
   utils::{markdown::markdown_to_html, slurs::check_slurs_opt, validation::check_url_scheme},
 };
 use std::ops::Deref;
@@ -108,9 +108,13 @@ impl Object for ApubPost {
   #[tracing::instrument(skip_all)]
   async fn into_json(self, context: &Data<Self::DataType>) -> LemmyResult<Page> {
     let creator_id = self.creator_id;
-    let creator = Person::read(&mut context.pool(), creator_id).await?;
+    let creator = Person::read(&mut context.pool(), creator_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?;
     let community_id = self.community_id;
-    let community = Community::read(&mut context.pool(), community_id).await?;
+    let community = Community::read(&mut context.pool(), community_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     let language = LanguageTag::new_single(self.language_id, &mut context.pool()).await?;
 
     let attachment = self
diff --git a/crates/apub/src/objects/private_message.rs b/crates/apub/src/objects/private_message.rs
index 4600c997af..35f2fe4185 100644
--- a/crates/apub/src/objects/private_message.rs
+++ b/crates/apub/src/objects/private_message.rs
@@ -79,10 +79,14 @@ impl Object for ApubPrivateMessage {
   #[tracing::instrument(skip_all)]
   async fn into_json(self, context: &Data<Self::DataType>) -> LemmyResult<ChatMessage> {
     let creator_id = self.creator_id;
-    let creator = Person::read(&mut context.pool(), creator_id).await?;
+    let creator = Person::read(&mut context.pool(), creator_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
     let recipient_id = self.recipient_id;
-    let recipient = Person::read(&mut context.pool(), recipient_id).await?;
+    let recipient = Person::read(&mut context.pool(), recipient_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
     let note = ChatMessage {
       r#type: ChatMessageType::ChatMessage,
diff --git a/crates/apub/src/protocol/activities/community/collection_add.rs b/crates/apub/src/protocol/activities/community/collection_add.rs
index 777ad8b621..0e2ab75a6f 100644
--- a/crates/apub/src/protocol/activities/community/collection_add.rs
+++ b/crates/apub/src/protocol/activities/community/collection_add.rs
@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::source::community::Community;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -35,7 +35,9 @@ pub struct CollectionAdd {
 impl InCommunity for CollectionAdd {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let (community, _) =
-      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into()).await?;
+      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into())
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }
diff --git a/crates/apub/src/protocol/activities/community/collection_remove.rs b/crates/apub/src/protocol/activities/community/collection_remove.rs
index afc0c24a01..51c4761baa 100644
--- a/crates/apub/src/protocol/activities/community/collection_remove.rs
+++ b/crates/apub/src/protocol/activities/community/collection_remove.rs
@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::source::community::Community;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -35,7 +35,9 @@ pub struct CollectionRemove {
 impl InCommunity for CollectionRemove {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let (community, _) =
-      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into()).await?;
+      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into())
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }
diff --git a/crates/apub/src/protocol/activities/community/lock_page.rs b/crates/apub/src/protocol/activities/community/lock_page.rs
index 0a4a2ff754..c60b86cf8c 100644
--- a/crates/apub/src/protocol/activities/community/lock_page.rs
+++ b/crates/apub/src/protocol/activities/community/lock_page.rs
@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{source::community::Community, traits::Crud};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::{Deserialize, Serialize};
 use strum_macros::Display;
 use url::Url;
@@ -55,7 +55,9 @@ pub struct UndoLockPage {
 impl InCommunity for LockPage {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let post = self.object.dereference(context).await?;
-    let community = Community::read(&mut context.pool(), post.community_id).await?;
+    let community = Community::read(&mut context.pool(), post.community_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }
diff --git a/crates/apub/src/protocol/activities/create_or_update/note.rs b/crates/apub/src/protocol/activities/create_or_update/note.rs
index ff07281744..43ffeb291f 100644
--- a/crates/apub/src/protocol/activities/create_or_update/note.rs
+++ b/crates/apub/src/protocol/activities/create_or_update/note.rs
@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{source::community::Community, traits::Crud};
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -36,7 +36,9 @@ pub struct CreateOrUpdateNote {
 impl InCommunity for CreateOrUpdateNote {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let post = self.object.get_parents(context).await?.0;
-    let community = Community::read(&mut context.pool(), post.community_id).await?;
+    let community = Community::read(&mut context.pool(), post.community_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }
diff --git a/crates/apub/src/protocol/activities/deletion/delete.rs b/crates/apub/src/protocol/activities/deletion/delete.rs
index 3a29da069a..3b9aad079d 100644
--- a/crates/apub/src/protocol/activities/deletion/delete.rs
+++ b/crates/apub/src/protocol/activities/deletion/delete.rs
@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use url::Url;
@@ -51,7 +51,9 @@ impl InCommunity for Delete {
     let community_id = match DeletableObjects::read_from_db(self.object.id(), context).await? {
       DeletableObjects::Community(c) => c.id,
       DeletableObjects::Comment(c) => {
-        let post = Post::read(&mut context.pool(), c.post_id).await?;
+        let post = Post::read(&mut context.pool(), c.post_id)
+          .await?
+          .ok_or(LemmyErrorType::CouldntFindPost)?;
         post.community_id
       }
       DeletableObjects::Post(p) => p.community_id,
@@ -60,7 +62,9 @@ impl InCommunity for Delete {
         return Err(anyhow!("Private message is not part of community").into())
       }
     };
-    let community = Community::read(&mut context.pool(), community_id).await?;
+    let community = Community::read(&mut context.pool(), community_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }
diff --git a/crates/apub/src/protocol/objects/note.rs b/crates/apub/src/protocol/objects/note.rs
index a092cec9f3..b0ae000372 100644
--- a/crates/apub/src/protocol/objects/note.rs
+++ b/crates/apub/src/protocol/objects/note.rs
@@ -20,7 +20,7 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use std::ops::Deref;
@@ -64,7 +64,9 @@ impl Note {
       PostOrComment::Post(p) => Ok((p.clone(), None)),
       PostOrComment::Comment(c) => {
         let post_id = c.post_id;
-        let post = Post::read(&mut context.pool(), post_id).await?;
+        let post = Post::read(&mut context.pool(), post_id)
+          .await?
+          .ok_or(LemmyErrorType::CouldntFindPost)?;
         Ok((post.into(), Some(c.clone())))
       }
     }
@@ -75,7 +77,9 @@ impl Note {
 impl InCommunity for Note {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let (post, _) = self.get_parents(context).await?;
-    let community = Community::read(&mut context.pool(), post.community_id).await?;
+    let community = Community::read(&mut context.pool(), post.community_id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }
diff --git a/crates/db_schema/src/aggregates/comment_aggregates.rs b/crates/db_schema/src/aggregates/comment_aggregates.rs
index 2120c7f387..915d17b1d0 100644
--- a/crates/db_schema/src/aggregates/comment_aggregates.rs
+++ b/crates/db_schema/src/aggregates/comment_aggregates.rs
@@ -1,5 +1,6 @@
 use crate::{
   aggregates::structs::CommentAggregates,
+  diesel::OptionalExtension,
   newtypes::CommentId,
   schema::comment_aggregates,
   utils::{functions::hot_rank, get_conn, DbPool},
@@ -8,12 +9,13 @@ use diesel::{result::Error, ExpressionMethods, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl CommentAggregates {
-  pub async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     comment_aggregates::table
       .find(comment_id)
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 
   pub async fn update_hot_rank(
@@ -125,6 +127,7 @@ mod tests {
 
     let comment_aggs_before_delete = CommentAggregates::read(pool, inserted_comment.id)
       .await
+      .unwrap()
       .unwrap();
 
     assert_eq!(1, comment_aggs_before_delete.score);
@@ -143,6 +146,7 @@ mod tests {
 
     let comment_aggs_after_dislike = CommentAggregates::read(pool, inserted_comment.id)
       .await
+      .unwrap()
       .unwrap();
 
     assert_eq!(0, comment_aggs_after_dislike.score);
@@ -155,6 +159,7 @@ mod tests {
       .unwrap();
     let after_like_remove = CommentAggregates::read(pool, inserted_comment.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(-1, after_like_remove.score);
     assert_eq!(0, after_like_remove.upvotes);
@@ -164,8 +169,10 @@ mod tests {
     Post::delete(pool, inserted_post.id).await.unwrap();
 
     // Should be none found, since the post was deleted
-    let after_delete = CommentAggregates::read(pool, inserted_comment.id).await;
-    assert!(after_delete.is_err());
+    let after_delete = CommentAggregates::read(pool, inserted_comment.id)
+      .await
+      .unwrap();
+    assert!(after_delete.is_none());
 
     // This should delete all the associated rows, and fire triggers
     Person::delete(pool, another_inserted_person.id)
diff --git a/crates/db_schema/src/aggregates/community_aggregates.rs b/crates/db_schema/src/aggregates/community_aggregates.rs
index f1f54663b6..0cf63809d2 100644
--- a/crates/db_schema/src/aggregates/community_aggregates.rs
+++ b/crates/db_schema/src/aggregates/community_aggregates.rs
@@ -1,5 +1,6 @@
 use crate::{
   aggregates::structs::CommunityAggregates,
+  diesel::OptionalExtension,
   newtypes::CommunityId,
   schema::{community_aggregates, community_aggregates::subscribers},
   utils::{get_conn, DbPool},
@@ -8,12 +9,16 @@ use diesel::{result::Error, ExpressionMethods, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl CommunityAggregates {
-  pub async fn read(pool: &mut DbPool<'_>, for_community_id: CommunityId) -> Result<Self, Error> {
+  pub async fn read(
+    pool: &mut DbPool<'_>,
+    for_community_id: CommunityId,
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     community_aggregates::table
       .find(for_community_id)
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 
   pub async fn update_federated_followers(
@@ -25,7 +30,7 @@ impl CommunityAggregates {
     let new_subscribers: i64 = new_subscribers.into();
     diesel::update(community_aggregates::table.find(for_community_id))
       .set(subscribers.eq(new_subscribers))
-      .get_result::<Self>(conn)
+      .get_result(conn)
       .await
   }
 }
@@ -153,6 +158,7 @@ mod tests {
 
     let community_aggregates_before_delete = CommunityAggregates::read(pool, inserted_community.id)
       .await
+      .unwrap()
       .unwrap();
 
     assert_eq!(2, community_aggregates_before_delete.subscribers);
@@ -163,6 +169,7 @@ mod tests {
     // Test the other community
     let another_community_aggs = CommunityAggregates::read(pool, another_inserted_community.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(1, another_community_aggs.subscribers);
     assert_eq!(1, another_community_aggs.subscribers_local);
@@ -175,6 +182,7 @@ mod tests {
       .unwrap();
     let after_unfollow = CommunityAggregates::read(pool, inserted_community.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(1, after_unfollow.subscribers);
     assert_eq!(1, after_unfollow.subscribers_local);
@@ -185,6 +193,7 @@ mod tests {
       .unwrap();
     let after_follow_again = CommunityAggregates::read(pool, inserted_community.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(2, after_follow_again.subscribers);
     assert_eq!(2, after_follow_again.subscribers_local);
@@ -193,6 +202,7 @@ mod tests {
     Post::delete(pool, inserted_post.id).await.unwrap();
     let after_parent_post_delete = CommunityAggregates::read(pool, inserted_community.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(0, after_parent_post_delete.comments);
     assert_eq!(0, after_parent_post_delete.posts);
@@ -203,6 +213,7 @@ mod tests {
       .unwrap();
     let after_person_delete = CommunityAggregates::read(pool, inserted_community.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(1, after_person_delete.subscribers);
     assert_eq!(1, after_person_delete.subscribers_local);
@@ -223,7 +234,9 @@ mod tests {
     assert_eq!(1, another_community_num_deleted);
 
     // Should be none found, since the creator was deleted
-    let after_delete = CommunityAggregates::read(pool, inserted_community.id).await;
-    assert!(after_delete.is_err());
+    let after_delete = CommunityAggregates::read(pool, inserted_community.id)
+      .await
+      .unwrap();
+    assert!(after_delete.is_none());
   }
 }
diff --git a/crates/db_schema/src/aggregates/person_aggregates.rs b/crates/db_schema/src/aggregates/person_aggregates.rs
index 520b452251..03295173f4 100644
--- a/crates/db_schema/src/aggregates/person_aggregates.rs
+++ b/crates/db_schema/src/aggregates/person_aggregates.rs
@@ -1,3 +1,4 @@
+pub(crate) use crate::diesel::OptionalExtension;
 use crate::{
   aggregates::structs::PersonAggregates,
   newtypes::PersonId,
@@ -8,12 +9,13 @@ use diesel::{result::Error, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl PersonAggregates {
-  pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     person_aggregates::table
       .find(person_id)
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
 
@@ -127,6 +129,7 @@ mod tests {
 
     let person_aggregates_before_delete = PersonAggregates::read(pool, inserted_person.id)
       .await
+      .unwrap()
       .unwrap();
 
     assert_eq!(1, person_aggregates_before_delete.post_count);
@@ -140,6 +143,7 @@ mod tests {
       .unwrap();
     let after_post_like_remove = PersonAggregates::read(pool, inserted_person.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(0, after_post_like_remove.post_score);
 
@@ -166,6 +170,7 @@ mod tests {
 
     let after_parent_comment_removed = PersonAggregates::read(pool, inserted_person.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(0, after_parent_comment_removed.comment_count);
     // TODO: fix person aggregate comment score calculation
@@ -178,6 +183,7 @@ mod tests {
       .unwrap();
     let after_parent_comment_delete = PersonAggregates::read(pool, inserted_person.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(0, after_parent_comment_delete.comment_count);
     // TODO: fix person aggregate comment score calculation
@@ -193,6 +199,7 @@ mod tests {
     CommentLike::like(pool, &comment_like).await.unwrap();
     let after_comment_add = PersonAggregates::read(pool, inserted_person.id)
       .await
+      .unwrap()
       .unwrap();
     assert_eq!(2, after_comment_add.comment_count);
     // TODO: fix person aggregate comment score calculation
@@ -201,6 +208,7 @@ mod tests {
     Post::delete(pool, inserted_post.id).await.unwrap();
     let after_post_delete = PersonAggregates::read(pool, inserted_person.id)
       .await
+      .unwrap()
       .unwrap();
     // TODO: fix person aggregate comment score calculation
     // assert_eq!(0, after_post_delete.comment_score);
@@ -222,8 +230,10 @@ mod tests {
     assert_eq!(1, community_num_deleted);
 
     // Should be none found
-    let after_delete = PersonAggregates::read(pool, inserted_person.id).await;
-    assert!(after_delete.is_err());
+    let after_delete = PersonAggregates::read(pool, inserted_person.id)
+      .await
+      .unwrap();
+    assert!(after_delete.is_none());
 
     Instance::delete(pool, inserted_instance.id).await.unwrap();
   }
diff --git a/crates/db_schema/src/aggregates/person_post_aggregates.rs b/crates/db_schema/src/aggregates/person_post_aggregates.rs
index 7657dae9e0..f6e108ee9a 100644
--- a/crates/db_schema/src/aggregates/person_post_aggregates.rs
+++ b/crates/db_schema/src/aggregates/person_post_aggregates.rs
@@ -1,5 +1,6 @@
 use crate::{
   aggregates::structs::{PersonPostAggregates, PersonPostAggregatesForm},
+  diesel::OptionalExtension,
   newtypes::{PersonId, PostId},
   schema::person_post_aggregates::dsl::{person_id, person_post_aggregates, post_id},
   utils::{get_conn, DbPool},
@@ -25,11 +26,12 @@ impl PersonPostAggregates {
     pool: &mut DbPool<'_>,
     person_id_: PersonId,
     post_id_: PostId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     person_post_aggregates
       .find((person_id_, post_id_))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
diff --git a/crates/db_schema/src/aggregates/post_aggregates.rs b/crates/db_schema/src/aggregates/post_aggregates.rs
index 7f95dc05ac..cb82277951 100644
--- a/crates/db_schema/src/aggregates/post_aggregates.rs
+++ b/crates/db_schema/src/aggregates/post_aggregates.rs
@@ -1,5 +1,6 @@
 use crate::{
   aggregates::structs::PostAggregates,
+  diesel::OptionalExtension,
   newtypes::PostId,
   schema::{community_aggregates, post, post_aggregates},
   utils::{
@@ -12,12 +13,13 @@ use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl PostAggregates {
-  pub async fn read(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     post_aggregates::table
       .find(post_id)
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 
   pub async fn update_ranks(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Self, Error> {
@@ -141,7 +143,10 @@ mod tests {
 
     PostLike::like(pool, &post_like).await.unwrap();
 
-    let post_aggs_before_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let post_aggs_before_delete = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
 
     assert_eq!(2, post_aggs_before_delete.comments);
     assert_eq!(1, post_aggs_before_delete.score);
@@ -157,7 +162,10 @@ mod tests {
 
     PostLike::like(pool, &post_dislike).await.unwrap();
 
-    let post_aggs_after_dislike = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let post_aggs_after_dislike = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
 
     assert_eq!(2, post_aggs_after_dislike.comments);
     assert_eq!(0, post_aggs_after_dislike.score);
@@ -169,7 +177,10 @@ mod tests {
     Comment::delete(pool, inserted_child_comment.id)
       .await
       .unwrap();
-    let after_comment_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let after_comment_delete = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
     assert_eq!(0, after_comment_delete.comments);
     assert_eq!(0, after_comment_delete.score);
     assert_eq!(1, after_comment_delete.upvotes);
@@ -179,7 +190,10 @@ mod tests {
     PostLike::remove(pool, inserted_person.id, inserted_post.id)
       .await
       .unwrap();
-    let after_like_remove = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let after_like_remove = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
     assert_eq!(0, after_like_remove.comments);
     assert_eq!(-1, after_like_remove.score);
     assert_eq!(0, after_like_remove.upvotes);
@@ -199,8 +213,8 @@ mod tests {
     assert_eq!(1, community_num_deleted);
 
     // Should be none found, since the creator was deleted
-    let after_delete = PostAggregates::read(pool, inserted_post.id).await;
-    assert!(after_delete.is_err());
+    let after_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    assert!(after_delete.is_none());
 
     Instance::delete(pool, inserted_instance.id).await.unwrap();
   }
@@ -248,7 +262,10 @@ mod tests {
 
     let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
 
-    let post_aggregates_before = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let post_aggregates_before = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
     assert_eq!(1, post_aggregates_before.comments);
 
     Comment::update(
@@ -262,7 +279,10 @@ mod tests {
     .await
     .unwrap();
 
-    let post_aggregates_after_remove = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let post_aggregates_after_remove = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
     assert_eq!(0, post_aggregates_after_remove.comments);
 
     Comment::update(
@@ -287,7 +307,10 @@ mod tests {
     .await
     .unwrap();
 
-    let post_aggregates_after_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let post_aggregates_after_delete = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
     assert_eq!(0, post_aggregates_after_delete.comments);
 
     Comment::update(
@@ -301,8 +324,10 @@ mod tests {
     .await
     .unwrap();
 
-    let post_aggregates_after_delete_remove =
-      PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let post_aggregates_after_delete_remove = PostAggregates::read(pool, inserted_post.id)
+      .await
+      .unwrap()
+      .unwrap();
     assert_eq!(0, post_aggregates_after_delete_remove.comments);
 
     Comment::delete(pool, inserted_comment.id).await.unwrap();
diff --git a/crates/db_schema/src/aggregates/site_aggregates.rs b/crates/db_schema/src/aggregates/site_aggregates.rs
index b179ff7c76..268a37aac5 100644
--- a/crates/db_schema/src/aggregates/site_aggregates.rs
+++ b/crates/db_schema/src/aggregates/site_aggregates.rs
@@ -1,5 +1,6 @@
 use crate::{
   aggregates::structs::SiteAggregates,
+  diesel::OptionalExtension,
   schema::site_aggregates,
   utils::{get_conn, DbPool},
 };
@@ -7,9 +8,9 @@ use diesel::result::Error;
 use diesel_async::RunQueryDsl;
 
 impl SiteAggregates {
-  pub async fn read(pool: &mut DbPool<'_>) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    site_aggregates::table.first::<Self>(conn).await
+    site_aggregates::table.first(conn).await.optional()
   }
 }
 
@@ -111,7 +112,7 @@ mod tests {
         .await
         .unwrap();
 
-    let site_aggregates_before_delete = SiteAggregates::read(pool).await.unwrap();
+    let site_aggregates_before_delete = SiteAggregates::read(pool).await.unwrap().unwrap();
 
     // TODO: this is unstable, sometimes it returns 0 users, sometimes 1
     //assert_eq!(0, site_aggregates_before_delete.users);
@@ -121,7 +122,7 @@ mod tests {
 
     // Try a post delete
     Post::delete(pool, inserted_post.id).await.unwrap();
-    let site_aggregates_after_post_delete = SiteAggregates::read(pool).await.unwrap();
+    let site_aggregates_after_post_delete = SiteAggregates::read(pool).await.unwrap().unwrap();
     assert_eq!(1, site_aggregates_after_post_delete.posts);
     assert_eq!(0, site_aggregates_after_post_delete.comments);
 
@@ -140,8 +141,8 @@ mod tests {
     assert!(after_delete_creator.is_ok());
 
     Site::delete(pool, inserted_site.id).await.unwrap();
-    let after_delete_site = SiteAggregates::read(pool).await;
-    assert!(after_delete_site.is_err());
+    let after_delete_site = SiteAggregates::read(pool).await.unwrap();
+    assert!(after_delete_site.is_none());
 
     Instance::delete(pool, inserted_instance.id).await.unwrap();
   }
@@ -155,7 +156,7 @@ mod tests {
     let (inserted_instance, inserted_person, inserted_site, inserted_community) =
       prepare_site_with_community(pool).await;
 
-    let site_aggregates_before = SiteAggregates::read(pool).await.unwrap();
+    let site_aggregates_before = SiteAggregates::read(pool).await.unwrap().unwrap();
     assert_eq!(1, site_aggregates_before.communities);
 
     Community::update(
@@ -169,7 +170,7 @@ mod tests {
     .await
     .unwrap();
 
-    let site_aggregates_after_delete = SiteAggregates::read(pool).await.unwrap();
+    let site_aggregates_after_delete = SiteAggregates::read(pool).await.unwrap().unwrap();
     assert_eq!(0, site_aggregates_after_delete.communities);
 
     Community::update(
@@ -194,7 +195,7 @@ mod tests {
     .await
     .unwrap();
 
-    let site_aggregates_after_remove = SiteAggregates::read(pool).await.unwrap();
+    let site_aggregates_after_remove = SiteAggregates::read(pool).await.unwrap().unwrap();
     assert_eq!(0, site_aggregates_after_remove.communities);
 
     Community::update(
@@ -208,7 +209,7 @@ mod tests {
     .await
     .unwrap();
 
-    let site_aggregates_after_remove_delete = SiteAggregates::read(pool).await.unwrap();
+    let site_aggregates_after_remove_delete = SiteAggregates::read(pool).await.unwrap().unwrap();
     assert_eq!(0, site_aggregates_after_remove_delete.communities);
 
     Community::delete(pool, inserted_community.id)
diff --git a/crates/db_schema/src/impls/activity.rs b/crates/db_schema/src/impls/activity.rs
index e1802c7c59..adcdf8ad5e 100644
--- a/crates/db_schema/src/impls/activity.rs
+++ b/crates/db_schema/src/impls/activity.rs
@@ -22,18 +22,22 @@ impl SentActivity {
       .await
   }
 
-  pub async fn read_from_apub_id(pool: &mut DbPool<'_>, object_id: &DbUrl) -> Result<Self, Error> {
+  pub async fn read_from_apub_id(
+    pool: &mut DbPool<'_>,
+    object_id: &DbUrl,
+  ) -> Result<Option<Self>, Error> {
     use crate::schema::sent_activity::dsl::{ap_id, sent_activity};
     let conn = &mut get_conn(pool).await?;
     sent_activity
       .filter(ap_id.eq(object_id))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
-  pub async fn read(pool: &mut DbPool<'_>, object_id: ActivityId) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, object_id: ActivityId) -> Result<Option<Self>, Error> {
     use crate::schema::sent_activity::dsl::sent_activity;
     let conn = &mut get_conn(pool).await?;
-    sent_activity.find(object_id).first::<Self>(conn).await
+    sent_activity.find(object_id).first(conn).await.optional()
   }
 }
 
@@ -118,7 +122,10 @@ mod tests {
 
     SentActivity::create(pool, form).await.unwrap();
 
-    let res = SentActivity::read_from_apub_id(pool, &ap_id).await.unwrap();
+    let res = SentActivity::read_from_apub_id(pool, &ap_id)
+      .await
+      .unwrap()
+      .unwrap();
     assert_eq!(res.ap_id, ap_id);
     assert_eq!(res.data, data);
     assert_eq!(res.sensitive, sensitive);
diff --git a/crates/db_schema/src/impls/comment.rs b/crates/db_schema/src/impls/comment.rs
index c0dad0ad32..30c058b893 100644
--- a/crates/db_schema/src/impls/comment.rs
+++ b/crates/db_schema/src/impls/comment.rs
@@ -1,5 +1,5 @@
 use crate::{
-  diesel::DecoratableTarget,
+  diesel::{DecoratableTarget, OptionalExtension},
   newtypes::{CommentId, DbUrl, PersonId},
   schema::comment,
   source::comment::{
@@ -155,14 +155,11 @@ where ca.comment_id = c.id"
   ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     let object_id: DbUrl = object_id.into();
-    Ok(
-      comment::table
-        .filter(comment::ap_id.eq(object_id))
-        .first::<Comment>(conn)
-        .await
-        .ok()
-        .map(Into::into),
-    )
+    comment::table
+      .filter(comment::ap_id.eq(object_id))
+      .first(conn)
+      .await
+      .optional()
   }
 
   pub fn parent_comment_id(&self) -> Option<CommentId> {
@@ -400,7 +397,10 @@ mod tests {
       .await
       .unwrap();
 
-    let read_comment = Comment::read(pool, inserted_comment.id).await.unwrap();
+    let read_comment = Comment::read(pool, inserted_comment.id)
+      .await
+      .unwrap()
+      .unwrap();
     let like_removed = CommentLike::remove(pool, inserted_person.id, inserted_comment.id)
       .await
       .unwrap();
diff --git a/crates/db_schema/src/impls/comment_reply.rs b/crates/db_schema/src/impls/comment_reply.rs
index e6d0915e93..4a4a49a132 100644
--- a/crates/db_schema/src/impls/comment_reply.rs
+++ b/crates/db_schema/src/impls/comment_reply.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::{CommentId, CommentReplyId, PersonId},
   schema::comment_reply,
   source::comment_reply::{CommentReply, CommentReplyInsertForm, CommentReplyUpdateForm},
@@ -63,25 +64,27 @@ impl CommentReply {
   pub async fn read_by_comment(
     pool: &mut DbPool<'_>,
     for_comment_id: CommentId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     comment_reply::table
       .filter(comment_reply::comment_id.eq(for_comment_id))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 
   pub async fn read_by_comment_and_person(
     pool: &mut DbPool<'_>,
     for_comment_id: CommentId,
     for_recipient_id: PersonId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     comment_reply::table
       .filter(comment_reply::comment_id.eq(for_comment_id))
       .filter(comment_reply::recipient_id.eq(for_recipient_id))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
 
@@ -174,7 +177,10 @@ mod tests {
       published: inserted_reply.published,
     };
 
-    let read_reply = CommentReply::read(pool, inserted_reply.id).await.unwrap();
+    let read_reply = CommentReply::read(pool, inserted_reply.id)
+      .await
+      .unwrap()
+      .unwrap();
 
     let comment_reply_update_form = CommentReplyUpdateForm { read: Some(false) };
     let updated_reply = CommentReply::update(pool, inserted_reply.id, &comment_reply_update_form)
diff --git a/crates/db_schema/src/impls/community.rs b/crates/db_schema/src/impls/community.rs
index 4dc45c09be..e886098ced 100644
--- a/crates/db_schema/src/impls/community.rs
+++ b/crates/db_schema/src/impls/community.rs
@@ -1,5 +1,5 @@
 use crate::{
-  diesel::DecoratableTarget,
+  diesel::{DecoratableTarget, OptionalExtension},
   newtypes::{CommunityId, DbUrl, PersonId},
   schema::{community, community_follower, instance},
   source::{
@@ -145,25 +145,30 @@ impl Community {
   pub async fn get_by_collection_url(
     pool: &mut DbPool<'_>,
     url: &DbUrl,
-  ) -> Result<(Community, CollectionType), Error> {
+  ) -> Result<Option<(Community, CollectionType)>, Error> {
     use crate::schema::community::dsl::{featured_url, moderators_url};
     use CollectionType::*;
     let conn = &mut get_conn(pool).await?;
     let res = community::table
       .filter(moderators_url.eq(url))
-      .first::<Self>(conn)
-      .await;
-    if let Ok(c) = res {
-      return Ok((c, Moderators));
-    }
-    let res = community::table
-      .filter(featured_url.eq(url))
-      .first::<Self>(conn)
-      .await;
-    if let Ok(c) = res {
-      return Ok((c, Featured));
+      .first(conn)
+      .await
+      .optional()?;
+
+    if let Some(c) = res {
+      Ok(Some((c, Moderators)))
+    } else {
+      let res = community::table
+        .filter(featured_url.eq(url))
+        .first(conn)
+        .await
+        .optional()?;
+      if let Some(c) = res {
+        Ok(Some((c, Featured)))
+      } else {
+        Ok(None)
+      }
     }
-    Err(diesel::NotFound)
   }
 
   pub async fn set_featured_posts(
@@ -348,21 +353,18 @@ impl ApubActor for Community {
     object_id: &DbUrl,
   ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    Ok(
-      community::table
-        .filter(community::actor_id.eq(object_id))
-        .first::<Community>(conn)
-        .await
-        .ok()
-        .map(Into::into),
-    )
+    community::table
+      .filter(community::actor_id.eq(object_id))
+      .first(conn)
+      .await
+      .optional()
   }
 
   async fn read_from_name(
     pool: &mut DbPool<'_>,
     community_name: &str,
     include_deleted: bool,
-  ) -> Result<Community, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     let mut q = community::table
       .into_boxed()
@@ -373,22 +375,23 @@ impl ApubActor for Community {
         .filter(community::deleted.eq(false))
         .filter(community::removed.eq(false));
     }
-    q.first::<Self>(conn).await
+    q.first(conn).await.optional()
   }
 
   async fn read_from_name_and_domain(
     pool: &mut DbPool<'_>,
     community_name: &str,
     for_domain: &str,
-  ) -> Result<Community, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     community::table
       .inner_join(instance::table)
       .filter(lower(community::name).eq(community_name.to_lowercase()))
       .filter(lower(instance::domain).eq(for_domain.to_lowercase()))
       .select(community::all_columns)
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
 
@@ -524,7 +527,10 @@ mod tests {
       expires: None,
     };
 
-    let read_community = Community::read(pool, inserted_community.id).await.unwrap();
+    let read_community = Community::read(pool, inserted_community.id)
+      .await
+      .unwrap()
+      .unwrap();
 
     let update_community_form = CommunityUpdateForm {
       title: Some("nada".to_owned()),
diff --git a/crates/db_schema/src/impls/email_verification.rs b/crates/db_schema/src/impls/email_verification.rs
index c5a8792fb0..b4951cf733 100644
--- a/crates/db_schema/src/impls/email_verification.rs
+++ b/crates/db_schema/src/impls/email_verification.rs
@@ -16,6 +16,7 @@ use diesel::{
   sql_types::Timestamptz,
   ExpressionMethods,
   IntoSql,
+  OptionalExtension,
   QueryDsl,
 };
 use diesel_async::RunQueryDsl;
@@ -25,17 +26,18 @@ impl EmailVerification {
     let conn = &mut get_conn(pool).await?;
     insert_into(email_verification)
       .values(form)
-      .get_result::<Self>(conn)
+      .get_result(conn)
       .await
   }
 
-  pub async fn read_for_token(pool: &mut DbPool<'_>, token: &str) -> Result<Self, Error> {
+  pub async fn read_for_token(pool: &mut DbPool<'_>, token: &str) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     email_verification
       .filter(verification_token.eq(token))
       .filter(published.gt(now.into_sql::<Timestamptz>() - 7.days()))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
   pub async fn delete_old_tokens_for_local_user(
     pool: &mut DbPool<'_>,
diff --git a/crates/db_schema/src/impls/instance.rs b/crates/db_schema/src/impls/instance.rs
index c329d8cc08..2e309efb93 100644
--- a/crates/db_schema/src/impls/instance.rs
+++ b/crates/db_schema/src/impls/instance.rs
@@ -26,6 +26,7 @@ use diesel::{
   result::Error,
   ExpressionMethods,
   NullableExpressionMethods,
+  OptionalExtension,
   QueryDsl,
   SelectableHelper,
 };
@@ -41,11 +42,14 @@ impl Instance {
     // First try to read the instance row and return directly if found
     let instance = instance::table
       .filter(lower(domain).eq(&domain_.to_lowercase()))
-      .first::<Self>(conn)
-      .await;
+      .first(conn)
+      .await
+      .optional()?;
+
+    // TODO could convert this to unwrap_or_else once async closures are stable
     match instance {
-      Ok(i) => Ok(i),
-      Err(diesel::NotFound) => {
+      Some(i) => Ok(i),
+      None => {
         // Instance not in database yet, insert it
         let form = InstanceForm::builder()
           .domain(domain_)
@@ -61,7 +65,6 @@ impl Instance {
           .get_result::<Self>(conn)
           .await
       }
-      e => e,
     }
   }
   pub async fn update(
diff --git a/crates/db_schema/src/impls/language.rs b/crates/db_schema/src/impls/language.rs
index 9052214026..6a7b4e9ac4 100644
--- a/crates/db_schema/src/impls/language.rs
+++ b/crates/db_schema/src/impls/language.rs
@@ -1,7 +1,7 @@
 use crate::{
   diesel::ExpressionMethods,
   newtypes::LanguageId,
-  schema::language::dsl::{code, language},
+  schema::language,
   source::language::Language,
   utils::{get_conn, DbPool},
 };
@@ -9,14 +9,14 @@ use diesel::{result::Error, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl Language {
-  pub async fn read_all(pool: &mut DbPool<'_>) -> Result<Vec<Language>, Error> {
+  pub async fn read_all(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    language.load::<Self>(conn).await
+    language::table.load(conn).await
   }
 
-  pub async fn read_from_id(pool: &mut DbPool<'_>, id_: LanguageId) -> Result<Language, Error> {
+  pub async fn read_from_id(pool: &mut DbPool<'_>, id_: LanguageId) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
-    language.find(id_).first::<Self>(conn).await
+    language::table.find(id_).first(conn).await
   }
 
   /// Attempts to find the given language code and return its ID. If not found, returns none.
@@ -27,8 +27,8 @@ impl Language {
     if let Some(code_) = code_ {
       let conn = &mut get_conn(pool).await?;
       Ok(
-        language
-          .filter(code.eq(code_))
+        language::table
+          .filter(language::code.eq(code_))
           .first::<Self>(conn)
           .await
           .map(|l| l.id)
diff --git a/crates/db_schema/src/impls/local_site.rs b/crates/db_schema/src/impls/local_site.rs
index 39ed624ef1..602dfe1f44 100644
--- a/crates/db_schema/src/impls/local_site.rs
+++ b/crates/db_schema/src/impls/local_site.rs
@@ -28,7 +28,7 @@ impl LocalSite {
       CACHE
         .try_get_with((), async {
           let conn = &mut get_conn(pool).await?;
-          local_site::table.first::<Self>(conn).await
+          local_site::table.first(conn).await
         })
         .await?,
     )
diff --git a/crates/db_schema/src/impls/local_site_rate_limit.rs b/crates/db_schema/src/impls/local_site_rate_limit.rs
index 0c9e96e0b4..6ab9ca8b83 100644
--- a/crates/db_schema/src/impls/local_site_rate_limit.rs
+++ b/crates/db_schema/src/impls/local_site_rate_limit.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   schema::local_site_rate_limit,
   source::local_site_rate_limit::{
     LocalSiteRateLimit,
@@ -11,9 +12,9 @@ use diesel::{dsl::insert_into, result::Error};
 use diesel_async::RunQueryDsl;
 
 impl LocalSiteRateLimit {
-  pub async fn read(pool: &mut DbPool<'_>) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    local_site_rate_limit::table.first::<Self>(conn).await
+    local_site_rate_limit::table.first(conn).await.optional()
   }
 
   pub async fn create(
diff --git a/crates/db_schema/src/impls/local_user_vote_display_mode.rs b/crates/db_schema/src/impls/local_user_vote_display_mode.rs
index 4458fc1b66..d77502335f 100644
--- a/crates/db_schema/src/impls/local_user_vote_display_mode.rs
+++ b/crates/db_schema/src/impls/local_user_vote_display_mode.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::LocalUserId,
   schema::local_user_vote_display_mode,
   source::local_user_vote_display_mode::{
@@ -12,11 +13,12 @@ use diesel::{dsl::insert_into, result::Error, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl LocalUserVoteDisplayMode {
-  pub async fn read(pool: &mut DbPool<'_>) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     local_user_vote_display_mode::table
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 
   pub async fn create(
diff --git a/crates/db_schema/src/impls/moderator.rs b/crates/db_schema/src/impls/moderator.rs
index 99f117878f..125bbcd51b 100644
--- a/crates/db_schema/src/impls/moderator.rs
+++ b/crates/db_schema/src/impls/moderator.rs
@@ -568,6 +568,7 @@ mod tests {
       .unwrap();
     let read_mod_remove_post = ModRemovePost::read(pool, inserted_mod_remove_post.id)
       .await
+      .unwrap()
       .unwrap();
     let expected_mod_remove_post = ModRemovePost {
       id: inserted_mod_remove_post.id,
@@ -590,6 +591,7 @@ mod tests {
       .unwrap();
     let read_mod_lock_post = ModLockPost::read(pool, inserted_mod_lock_post.id)
       .await
+      .unwrap()
       .unwrap();
     let expected_mod_lock_post = ModLockPost {
       id: inserted_mod_lock_post.id,
@@ -612,6 +614,7 @@ mod tests {
       .unwrap();
     let read_mod_feature_post = ModFeaturePost::read(pool, inserted_mod_feature_post.id)
       .await
+      .unwrap()
       .unwrap();
     let expected_mod_feature_post = ModFeaturePost {
       id: inserted_mod_feature_post.id,
@@ -635,6 +638,7 @@ mod tests {
       .unwrap();
     let read_mod_remove_comment = ModRemoveComment::read(pool, inserted_mod_remove_comment.id)
       .await
+      .unwrap()
       .unwrap();
     let expected_mod_remove_comment = ModRemoveComment {
       id: inserted_mod_remove_comment.id,
@@ -660,6 +664,7 @@ mod tests {
     let read_mod_remove_community =
       ModRemoveCommunity::read(pool, inserted_mod_remove_community.id)
         .await
+        .unwrap()
         .unwrap();
     let expected_mod_remove_community = ModRemoveCommunity {
       id: inserted_mod_remove_community.id,
@@ -687,6 +692,7 @@ mod tests {
     let read_mod_ban_from_community =
       ModBanFromCommunity::read(pool, inserted_mod_ban_from_community.id)
         .await
+        .unwrap()
         .unwrap();
     let expected_mod_ban_from_community = ModBanFromCommunity {
       id: inserted_mod_ban_from_community.id,
@@ -709,7 +715,10 @@ mod tests {
       expires: None,
     };
     let inserted_mod_ban = ModBan::create(pool, &mod_ban_form).await.unwrap();
-    let read_mod_ban = ModBan::read(pool, inserted_mod_ban.id).await.unwrap();
+    let read_mod_ban = ModBan::read(pool, inserted_mod_ban.id)
+      .await
+      .unwrap()
+      .unwrap();
     let expected_mod_ban = ModBan {
       id: inserted_mod_ban.id,
       mod_person_id: inserted_mod.id,
@@ -733,6 +742,7 @@ mod tests {
       .unwrap();
     let read_mod_add_community = ModAddCommunity::read(pool, inserted_mod_add_community.id)
       .await
+      .unwrap()
       .unwrap();
     let expected_mod_add_community = ModAddCommunity {
       id: inserted_mod_add_community.id,
@@ -751,7 +761,10 @@ mod tests {
       removed: None,
     };
     let inserted_mod_add = ModAdd::create(pool, &mod_add_form).await.unwrap();
-    let read_mod_add = ModAdd::read(pool, inserted_mod_add.id).await.unwrap();
+    let read_mod_add = ModAdd::read(pool, inserted_mod_add.id)
+      .await
+      .unwrap()
+      .unwrap();
     let expected_mod_add = ModAdd {
       id: inserted_mod_add.id,
       mod_person_id: inserted_mod.id,
diff --git a/crates/db_schema/src/impls/password_reset_request.rs b/crates/db_schema/src/impls/password_reset_request.rs
index 491097135b..762aa4656a 100644
--- a/crates/db_schema/src/impls/password_reset_request.rs
+++ b/crates/db_schema/src/impls/password_reset_request.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::LocalUserId,
   schema::password_reset_request::dsl::{local_user_id, password_reset_request, published, token},
   source::password_reset_request::{PasswordResetRequest, PasswordResetRequestForm},
@@ -54,16 +55,14 @@ impl PasswordResetRequest {
 
     Self::create(pool, &form).await
   }
-  pub async fn read_from_token(
-    pool: &mut DbPool<'_>,
-    token_: &str,
-  ) -> Result<PasswordResetRequest, Error> {
+  pub async fn read_from_token(pool: &mut DbPool<'_>, token_: &str) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     password_reset_request
       .filter(token.eq(token_))
       .filter(published.gt(now.into_sql::<Timestamptz>() - 1.days()))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 
   pub async fn get_recent_password_resets_count(
@@ -141,6 +140,7 @@ mod tests {
 
     let read_password_reset_request = PasswordResetRequest::read_from_token(pool, token)
       .await
+      .unwrap()
       .unwrap();
     let num_deleted = Person::delete(pool, inserted_person.id).await.unwrap();
     Instance::delete(pool, inserted_instance.id).await.unwrap();
diff --git a/crates/db_schema/src/impls/person.rs b/crates/db_schema/src/impls/person.rs
index c90f678913..68a9b3d599 100644
--- a/crates/db_schema/src/impls/person.rs
+++ b/crates/db_schema/src/impls/person.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::{CommunityId, DbUrl, InstanceId, PersonId},
   schema::{comment, community, instance, local_user, person, person_follower, post},
   source::person::{
@@ -19,13 +20,16 @@ impl Crud for Person {
   type InsertForm = PersonInsertForm;
   type UpdateForm = PersonUpdateForm;
   type IdType = PersonId;
-  async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
+
+  // Override this, so that you don't get back deleted
+  async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     person::table
       .filter(person::deleted.eq(false))
       .find(person_id)
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 
   async fn create(pool: &mut DbPool<'_>, form: &PersonInsertForm) -> Result<Self, Error> {
@@ -126,22 +130,19 @@ impl ApubActor for Person {
     object_id: &DbUrl,
   ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    Ok(
-      person::table
-        .filter(person::deleted.eq(false))
-        .filter(person::actor_id.eq(object_id))
-        .first::<Person>(conn)
-        .await
-        .ok()
-        .map(Into::into),
-    )
+    person::table
+      .filter(person::deleted.eq(false))
+      .filter(person::actor_id.eq(object_id))
+      .first(conn)
+      .await
+      .optional()
   }
 
   async fn read_from_name(
     pool: &mut DbPool<'_>,
     from_name: &str,
     include_deleted: bool,
-  ) -> Result<Person, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     let mut q = person::table
       .into_boxed()
@@ -150,14 +151,14 @@ impl ApubActor for Person {
     if !include_deleted {
       q = q.filter(person::deleted.eq(false))
     }
-    q.first::<Self>(conn).await
+    q.first(conn).await.optional()
   }
 
   async fn read_from_name_and_domain(
     pool: &mut DbPool<'_>,
     person_name: &str,
     for_domain: &str,
-  ) -> Result<Person, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
 
     person::table
@@ -165,8 +166,9 @@ impl ApubActor for Person {
       .filter(lower(person::name).eq(person_name.to_lowercase()))
       .filter(lower(instance::domain).eq(for_domain.to_lowercase()))
       .select(person::all_columns)
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
 
@@ -269,7 +271,10 @@ mod tests {
       instance_id: inserted_instance.id,
     };
 
-    let read_person = Person::read(pool, inserted_person.id).await.unwrap();
+    let read_person = Person::read(pool, inserted_person.id)
+      .await
+      .unwrap()
+      .unwrap();
 
     let update_person_form = PersonUpdateForm {
       actor_id: Some(inserted_person.actor_id.clone()),
diff --git a/crates/db_schema/src/impls/person_mention.rs b/crates/db_schema/src/impls/person_mention.rs
index 5524f87ee9..8566d31b17 100644
--- a/crates/db_schema/src/impls/person_mention.rs
+++ b/crates/db_schema/src/impls/person_mention.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::{CommentId, PersonId, PersonMentionId},
   schema::person_mention,
   source::person_mention::{PersonMention, PersonMentionInsertForm, PersonMentionUpdateForm},
@@ -63,13 +64,14 @@ impl PersonMention {
     pool: &mut DbPool<'_>,
     for_comment_id: CommentId,
     for_recipient_id: PersonId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     person_mention::table
       .filter(person_mention::comment_id.eq(for_comment_id))
       .filter(person_mention::recipient_id.eq(for_recipient_id))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
 
@@ -164,6 +166,7 @@ mod tests {
 
     let read_mention = PersonMention::read(pool, inserted_mention.id)
       .await
+      .unwrap()
       .unwrap();
 
     let person_mention_update_form = PersonMentionUpdateForm { read: Some(false) };
diff --git a/crates/db_schema/src/impls/post.rs b/crates/db_schema/src/impls/post.rs
index 596eb62bfe..2d055b1a85 100644
--- a/crates/db_schema/src/impls/post.rs
+++ b/crates/db_schema/src/impls/post.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::{CommunityId, DbUrl, PersonId, PostId},
   schema::{post, post_hide, post_like, post_read, post_saved},
   source::post::{
@@ -182,14 +183,11 @@ impl Post {
   ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     let object_id: DbUrl = object_id.into();
-    Ok(
-      post::table
-        .filter(post::ap_id.eq(object_id))
-        .first::<Post>(conn)
-        .await
-        .ok()
-        .map(Into::into),
-    )
+    post::table
+      .filter(post::ap_id.eq(object_id))
+      .first(conn)
+      .await
+      .optional()
   }
 
   pub async fn fetch_pictrs_posts_for_creator(
@@ -517,7 +515,7 @@ mod tests {
     .unwrap();
     assert_eq!(2, marked_as_read);
 
-    let read_post = Post::read(pool, inserted_post.id).await.unwrap();
+    let read_post = Post::read(pool, inserted_post.id).await.unwrap().unwrap();
 
     let new_post_update = PostUpdateForm {
       name: Some("A test post".into()),
diff --git a/crates/db_schema/src/impls/private_message.rs b/crates/db_schema/src/impls/private_message.rs
index e3ad039728..75c7ce9bcb 100644
--- a/crates/db_schema/src/impls/private_message.rs
+++ b/crates/db_schema/src/impls/private_message.rs
@@ -1,5 +1,5 @@
 use crate::{
-  diesel::DecoratableTarget,
+  diesel::{DecoratableTarget, OptionalExtension},
   newtypes::{DbUrl, PersonId, PrivateMessageId},
   schema::private_message,
   source::private_message::{PrivateMessage, PrivateMessageInsertForm, PrivateMessageUpdateForm},
@@ -9,7 +9,6 @@ use crate::{
 use chrono::{DateTime, Utc};
 use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
 use diesel_async::RunQueryDsl;
-use lemmy_utils::error::LemmyResult;
 use url::Url;
 
 #[async_trait]
@@ -74,17 +73,14 @@ impl PrivateMessage {
   pub async fn read_from_apub_id(
     pool: &mut DbPool<'_>,
     object_id: Url,
-  ) -> LemmyResult<Option<Self>> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     let object_id: DbUrl = object_id.into();
-    Ok(
-      private_message::table
-        .filter(private_message::ap_id.eq(object_id))
-        .first::<PrivateMessage>(conn)
-        .await
-        .ok()
-        .map(Into::into),
-    )
+    private_message::table
+      .filter(private_message::ap_id.eq(object_id))
+      .first(conn)
+      .await
+      .optional()
   }
 }
 
@@ -156,6 +152,7 @@ mod tests {
 
     let read_private_message = PrivateMessage::read(pool, inserted_private_message.id)
       .await
+      .unwrap()
       .unwrap();
 
     let private_message_update_form = PrivateMessageUpdateForm {
diff --git a/crates/db_schema/src/impls/registration_application.rs b/crates/db_schema/src/impls/registration_application.rs
index c4df7ba69e..46b7d4bee3 100644
--- a/crates/db_schema/src/impls/registration_application.rs
+++ b/crates/db_schema/src/impls/registration_application.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::LocalUserId,
   schema::registration_application::dsl::{local_user_id, registration_application},
   source::registration_application::{
@@ -43,11 +44,12 @@ impl RegistrationApplication {
   pub async fn find_by_local_user_id(
     pool: &mut DbPool<'_>,
     local_user_id_: LocalUserId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     registration_application
       .filter(local_user_id.eq(local_user_id_))
-      .first::<Self>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
diff --git a/crates/db_schema/src/impls/secret.rs b/crates/db_schema/src/impls/secret.rs
index f21c6c4873..1365ea838e 100644
--- a/crates/db_schema/src/impls/secret.rs
+++ b/crates/db_schema/src/impls/secret.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   schema::secret::dsl::secret,
   source::secret::Secret,
   utils::{get_conn, DbPool},
@@ -9,12 +10,12 @@ use diesel_async::RunQueryDsl;
 impl Secret {
   /// Initialize the Secrets from the DB.
   /// Warning: You should only call this once.
-  pub async fn init(pool: &mut DbPool<'_>) -> Result<Secret, Error> {
+  pub async fn init(pool: &mut DbPool<'_>) -> Result<Option<Secret>, Error> {
     Self::read_secrets(pool).await
   }
 
-  async fn read_secrets(pool: &mut DbPool<'_>) -> Result<Secret, Error> {
+  async fn read_secrets(pool: &mut DbPool<'_>) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    secret.first::<Secret>(conn).await
+    secret.first(conn).await.optional()
   }
 }
diff --git a/crates/db_schema/src/impls/site.rs b/crates/db_schema/src/impls/site.rs
index 7e9329afbc..a371f9e077 100644
--- a/crates/db_schema/src/impls/site.rs
+++ b/crates/db_schema/src/impls/site.rs
@@ -1,6 +1,6 @@
 use crate::{
   newtypes::{DbUrl, InstanceId, SiteId},
-  schema::site::dsl::{actor_id, id, instance_id, site},
+  schema::site,
   source::{
     actor_language::SiteLanguage,
     site::{Site, SiteInsertForm, SiteUpdateForm},
@@ -19,7 +19,7 @@ impl Crud for Site {
   type IdType = SiteId;
 
   /// Use SiteView::read_local, or Site::read_from_apub_id instead
-  async fn read(_pool: &mut DbPool<'_>, _site_id: SiteId) -> Result<Self, Error> {
+  async fn read(_pool: &mut DbPool<'_>, _site_id: SiteId) -> Result<Option<Self>, Error> {
     unimplemented!()
   }
 
@@ -31,9 +31,9 @@ impl Crud for Site {
     let conn = &mut get_conn(pool).await?;
 
     // Can't do separate insert/update commands because InsertForm/UpdateForm aren't convertible
-    let site_ = insert_into(site)
+    let site_ = insert_into(site::table)
       .values(form)
-      .on_conflict(actor_id)
+      .on_conflict(site::actor_id)
       .do_update()
       .set(form)
       .get_result::<Self>(conn)
@@ -53,7 +53,7 @@ impl Crud for Site {
     new_site: &Self::UpdateForm,
   ) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
-    diesel::update(site.find(site_id))
+    diesel::update(site::table.find(site_id))
       .set(new_site)
       .get_result::<Self>(conn)
       .await
@@ -66,9 +66,9 @@ impl Site {
     _instance_id: InstanceId,
   ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    site
-      .filter(instance_id.eq(_instance_id))
-      .get_result(conn)
+    site::table
+      .filter(site::instance_id.eq(_instance_id))
+      .first(conn)
       .await
       .optional()
   }
@@ -78,17 +78,20 @@ impl Site {
   ) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
 
-    site
-      .filter(actor_id.eq(object_id))
-      .first::<Site>(conn)
+    site::table
+      .filter(site::actor_id.eq(object_id))
+      .first(conn)
       .await
       .optional()
-      .map(Into::into)
   }
 
   pub async fn read_remote_sites(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
-    site.order_by(id).offset(1).get_results::<Self>(conn).await
+    site::table
+      .order_by(site::id)
+      .offset(1)
+      .get_results::<Self>(conn)
+      .await
   }
 
   /// Instance actor is at the root path, so we simply need to clear the path and other unnecessary
diff --git a/crates/db_schema/src/traits.rs b/crates/db_schema/src/traits.rs
index b0434a65cc..139ec0e156 100644
--- a/crates/db_schema/src/traits.rs
+++ b/crates/db_schema/src/traits.rs
@@ -1,4 +1,5 @@
 use crate::{
+  diesel::OptionalExtension,
   newtypes::{CommunityId, DbUrl, PersonId},
   utils::{get_conn, DbPool},
 };
@@ -42,10 +43,10 @@ where
 
   async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error>;
 
-  async fn read(pool: &mut DbPool<'_>, id: Self::IdType) -> Result<Self, Error> {
+  async fn read(pool: &mut DbPool<'_>, id: Self::IdType) -> Result<Option<Self>, Error> {
     let query: Find<Self> = Self::table().find(id);
     let conn = &mut *get_conn(pool).await?;
-    query.first::<Self>(conn).await
+    query.first(conn).await.optional()
   }
 
   /// when you want to null out a column, you have to send Some(None)), since sending None means you just don't want to update that column.
@@ -185,14 +186,14 @@ pub trait ApubActor {
     pool: &mut DbPool<'_>,
     actor_name: &str,
     include_deleted: bool,
-  ) -> Result<Self, Error>
+  ) -> Result<Option<Self>, Error>
   where
     Self: Sized;
   async fn read_from_name_and_domain(
     pool: &mut DbPool<'_>,
     actor_name: &str,
     protocol_domain: &str,
-  ) -> Result<Self, Error>
+  ) -> Result<Option<Self>, Error>
   where
     Self: Sized;
 }
diff --git a/crates/db_schema/src/utils.rs b/crates/db_schema/src/utils.rs
index f0b294c04a..dcd2088816 100644
--- a/crates/db_schema/src/utils.rs
+++ b/crates/db_schema/src/utils.rs
@@ -13,9 +13,14 @@ use diesel::{
   pg::Pg,
   query_builder::{Query, QueryFragment},
   query_dsl::methods::LimitDsl,
-  result::{ConnectionError, ConnectionResult, Error as DieselError, Error::QueryBuilderError},
+  result::{
+    ConnectionError,
+    ConnectionResult,
+    Error::{self as DieselError, QueryBuilderError},
+  },
   sql_types::{self, Timestamptz},
   IntoSql,
+  OptionalExtension,
   PgConnection,
 };
 use diesel_async::{
@@ -510,12 +515,12 @@ impl<RF, LF> Queries<RF, LF> {
     self,
     pool: &'a mut DbPool<'_>,
     args: Args,
-  ) -> Result<T, DieselError>
+  ) -> Result<Option<T>, DieselError>
   where
     RF: ReadFn<'a, T, Args>,
   {
     let conn = get_conn(pool).await?;
-    (self.read_fn)(conn, args).await
+    (self.read_fn)(conn, args).await.optional()
   }
 
   pub async fn list<'a, T, Args>(
diff --git a/crates/db_views/src/comment_report_view.rs b/crates/db_views/src/comment_report_view.rs
index 0da5b3cff6..e524e9a306 100644
--- a/crates/db_views/src/comment_report_view.rs
+++ b/crates/db_views/src/comment_report_view.rs
@@ -134,7 +134,7 @@ fn queries<'a>() -> Queries<
       comment_report::table.find(report_id).into_boxed(),
       my_person_id,
     )
-    .first::<CommentReportView>(&mut conn)
+    .first(&mut conn)
     .await
   };
 
@@ -191,7 +191,7 @@ impl CommentReportView {
     pool: &mut DbPool<'_>,
     report_id: CommentReportId,
     my_person_id: PersonId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, (report_id, my_person_id)).await
   }
 
@@ -396,11 +396,13 @@ mod tests {
 
     let agg = CommentAggregates::read(pool, inserted_comment.id)
       .await
+      .unwrap()
       .unwrap();
 
     let read_jessica_report_view =
       CommentReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id)
         .await
+        .unwrap()
         .unwrap();
     let expected_jessica_report_view = CommentReportView {
       comment_report: inserted_jessica_report.clone(),
@@ -554,6 +556,7 @@ mod tests {
     let read_jessica_report_view_after_resolve =
       CommentReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id)
         .await
+        .unwrap()
         .unwrap();
 
     let mut expected_jessica_report_view_after_resolve = expected_jessica_report_view;
diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs
index 01ff394eb0..e8957e1e94 100644
--- a/crates/db_views/src/comment_view.rs
+++ b/crates/db_views/src/comment_view.rs
@@ -191,7 +191,7 @@ fn queries<'a>() -> Queries<
     if my_person_id.is_none() {
       query = query.filter(community::visibility.eq(CommunityVisibility::Public));
     }
-    query.first::<CommentView>(&mut conn).await
+    query.first(&mut conn).await
   };
 
   let list = move |mut conn: DbConn<'a>, options: CommentQuery<'a>| async move {
@@ -375,17 +375,21 @@ impl CommentView {
     pool: &mut DbPool<'_>,
     comment_id: CommentId,
     my_person_id: Option<PersonId>,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     // If a person is given, then my_vote (res.9), if None, should be 0, not null
     // Necessary to differentiate between other person's votes
-    let mut res = queries().read(pool, (comment_id, my_person_id)).await?;
-    if my_person_id.is_some() && res.my_vote.is_none() {
-      res.my_vote = Some(0);
-    }
-    if res.comment.deleted || res.comment.removed {
-      res.comment.content = String::new();
+    if let Ok(Some(res)) = queries().read(pool, (comment_id, my_person_id)).await {
+      let mut new_view = res.clone();
+      if my_person_id.is_some() && res.my_vote.is_none() {
+        new_view.my_vote = Some(0);
+      }
+      if res.comment.deleted || res.comment.removed {
+        new_view.comment.content = String::new();
+      }
+      Ok(Some(new_view))
+    } else {
+      Ok(None)
     }
-    Ok(res)
   }
 }
 
@@ -472,7 +476,7 @@ mod tests {
     CommunityVisibility,
     SubscribedType,
   };
-  use lemmy_utils::error::LemmyResult;
+  use lemmy_utils::{error::LemmyResult, LemmyErrorType};
   use pretty_assertions::assert_eq;
   use serial_test::serial;
 
@@ -700,7 +704,8 @@ mod tests {
       data.inserted_comment_1.id,
       Some(data.timmy_local_user_view.person.id),
     )
-    .await?;
+    .await?
+    .unwrap();
 
     // Make sure block set the creator blocked
     assert!(read_comment_from_blocked_person.creator_blocked);
@@ -1009,7 +1014,9 @@ mod tests {
   }
 
   async fn expected_comment_view(data: &Data, pool: &mut DbPool<'_>) -> LemmyResult<CommentView> {
-    let agg = CommentAggregates::read(pool, data.inserted_comment_0.id).await?;
+    let agg = CommentAggregates::read(pool, data.inserted_comment_0.id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindComment)?;
     Ok(CommentView {
       creator_banned_from_community: false,
       banned_from_community: false,
@@ -1154,8 +1161,8 @@ mod tests {
     .await?;
     assert_eq!(5, authenticated_query.len());
 
-    let unauthenticated_comment = CommentView::read(pool, data.inserted_comment_0.id, None).await;
-    assert!(unauthenticated_comment.is_err());
+    let unauthenticated_comment = CommentView::read(pool, data.inserted_comment_0.id, None).await?;
+    assert!(unauthenticated_comment.is_none());
 
     let authenticated_comment = CommentView::read(
       pool,
@@ -1202,7 +1209,8 @@ mod tests {
       data.inserted_comment_0.id,
       Some(inserted_banned_from_comm_local_user.person_id),
     )
-    .await?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
     assert!(comment_view.banned_from_community);
 
@@ -1222,7 +1230,8 @@ mod tests {
       data.inserted_comment_0.id,
       Some(data.timmy_local_user_view.person.id),
     )
-    .await?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindComment)?;
 
     assert!(!comment_view.banned_from_community);
 
diff --git a/crates/db_views/src/local_user_view.rs b/crates/db_views/src/local_user_view.rs
index 96d6a35307..0c13b0a684 100644
--- a/crates/db_views/src/local_user_view.rs
+++ b/crates/db_views/src/local_user_view.rs
@@ -62,7 +62,7 @@ fn queries<'a>(
       .inner_join(local_user_vote_display_mode::table)
       .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
       .select(selection)
-      .first::<LocalUserView>(&mut conn)
+      .first(&mut conn)
       .await
   };
 
@@ -86,28 +86,37 @@ fn queries<'a>(
 }
 
 impl LocalUserView {
-  pub async fn read(pool: &mut DbPool<'_>, local_user_id: LocalUserId) -> Result<Self, Error> {
+  pub async fn read(
+    pool: &mut DbPool<'_>,
+    local_user_id: LocalUserId,
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, ReadBy::Id(local_user_id)).await
   }
 
-  pub async fn read_person(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
+  pub async fn read_person(
+    pool: &mut DbPool<'_>,
+    person_id: PersonId,
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, ReadBy::Person(person_id)).await
   }
 
-  pub async fn read_from_name(pool: &mut DbPool<'_>, name: &str) -> Result<Self, Error> {
+  pub async fn read_from_name(pool: &mut DbPool<'_>, name: &str) -> Result<Option<Self>, Error> {
     queries().read(pool, ReadBy::Name(name)).await
   }
 
   pub async fn find_by_email_or_name(
     pool: &mut DbPool<'_>,
     name_or_email: &str,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries()
       .read(pool, ReadBy::NameOrEmail(name_or_email))
       .await
   }
 
-  pub async fn find_by_email(pool: &mut DbPool<'_>, from_email: &str) -> Result<Self, Error> {
+  pub async fn find_by_email(
+    pool: &mut DbPool<'_>,
+    from_email: &str,
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, ReadBy::Email(from_email)).await
   }
 
diff --git a/crates/db_views/src/post_report_view.rs b/crates/db_views/src/post_report_view.rs
index 878937d01c..76679df1ed 100644
--- a/crates/db_views/src/post_report_view.rs
+++ b/crates/db_views/src/post_report_view.rs
@@ -163,7 +163,7 @@ fn queries<'a>() -> Queries<
       post_report::table.find(report_id).into_boxed(),
       my_person_id,
     )
-    .first::<PostReportView>(&mut conn)
+    .first(&mut conn)
     .await
   };
 
@@ -219,7 +219,7 @@ impl PostReportView {
     pool: &mut DbPool<'_>,
     report_id: PostReportId,
     my_person_id: PersonId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, (report_id, my_person_id)).await
   }
 
@@ -421,6 +421,7 @@ mod tests {
     let read_jessica_report_view =
       PostReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id)
         .await
+        .unwrap()
         .unwrap();
 
     assert_eq!(
@@ -458,6 +459,7 @@ mod tests {
     let read_jessica_report_view_after_resolve =
       PostReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id)
         .await
+        .unwrap()
         .unwrap();
     assert!(read_jessica_report_view_after_resolve.post_report.resolved);
     assert_eq!(
diff --git a/crates/db_views/src/post_view.rs b/crates/db_views/src/post_view.rs
index b323437d57..e66912190f 100644
--- a/crates/db_views/src/post_view.rs
+++ b/crates/db_views/src/post_view.rs
@@ -305,7 +305,7 @@ fn queries<'a>() -> Queries<
 
       Commented::new(query)
         .text("PostView::read")
-        .first::<PostView>(&mut conn)
+        .first(&mut conn)
         .await
     };
 
@@ -581,12 +581,10 @@ impl PostView {
     post_id: PostId,
     my_person_id: Option<PersonId>,
     is_mod_or_admin: bool,
-  ) -> Result<Self, Error> {
-    let res = queries()
+  ) -> Result<Option<Self>, Error> {
+    queries()
       .read(pool, (post_id, my_person_id, is_mod_or_admin))
-      .await?;
-
-    Ok(res)
+      .await
   }
 }
 
@@ -597,19 +595,21 @@ impl PaginationCursor {
     PaginationCursor(format!("P{:x}", view.counts.post_id.0))
   }
   pub async fn read(&self, pool: &mut DbPool<'_>) -> Result<PaginationCursorData, Error> {
-    Ok(PaginationCursorData(
-      PostAggregates::read(
-        pool,
-        PostId(
-          self
-            .0
-            .get(1..)
-            .and_then(|e| i32::from_str_radix(e, 16).ok())
-            .ok_or_else(|| Error::QueryBuilderError("Could not parse pagination token".into()))?,
-        ),
-      )
-      .await?,
-    ))
+    let err_msg = || Error::QueryBuilderError("Could not parse pagination token".into());
+    let token = PostAggregates::read(
+      pool,
+      PostId(
+        self
+          .0
+          .get(1..)
+          .and_then(|e| i32::from_str_radix(e, 16).ok())
+          .ok_or_else(err_msg)?,
+      ),
+    )
+    .await?
+    .ok_or_else(err_msg)?;
+
+    Ok(PaginationCursorData(token))
   }
 }
 
@@ -783,7 +783,7 @@ mod tests {
     SortType,
     SubscribedType,
   };
-  use lemmy_utils::error::LemmyResult;
+  use lemmy_utils::error::{LemmyErrorType, LemmyResult};
   use pretty_assertions::assert_eq;
   use serial_test::serial;
   use std::{collections::HashSet, time::Duration};
@@ -964,7 +964,8 @@ mod tests {
       Some(data.local_user_view.person.id),
       false,
     )
-    .await?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
     let expected_post_listing_with_user = expected_post_view(&data, pool).await?;
 
@@ -1014,7 +1015,9 @@ mod tests {
     .await?;
 
     let read_post_listing_single_no_person =
-      PostView::read(pool, data.inserted_post.id, None, false).await?;
+      PostView::read(pool, data.inserted_post.id, None, false)
+        .await?
+        .ok_or(LemmyErrorType::CouldntFindPost)?;
 
     let expected_post_listing_no_person = expected_post_view(&data, pool).await?;
 
@@ -1091,7 +1094,8 @@ mod tests {
       Some(data.local_user_view.person.id),
       false,
     )
-    .await?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
     let mut expected_post_with_upvote = expected_post_view(&data, pool).await?;
     expected_post_with_upvote.my_vote = Some(1);
@@ -1573,7 +1577,9 @@ mod tests {
       &data.inserted_community,
       &data.inserted_post,
     );
-    let agg = PostAggregates::read(pool, inserted_post.id).await?;
+    let agg = PostAggregates::read(pool, inserted_post.id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPost)?;
 
     Ok(PostView {
       post: Post {
@@ -1716,8 +1722,8 @@ mod tests {
     .await?;
     assert_eq!(2, authenticated_query.len());
 
-    let unauthenticated_post = PostView::read(pool, data.inserted_post.id, None, false).await;
-    assert!(unauthenticated_post.is_err());
+    let unauthenticated_post = PostView::read(pool, data.inserted_post.id, None, false).await?;
+    assert!(unauthenticated_post.is_none());
 
     let authenticated_post = PostView::read(
       pool,
@@ -1767,7 +1773,8 @@ mod tests {
       Some(inserted_banned_from_comm_local_user.person_id),
       false,
     )
-    .await?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
     assert!(post_view.banned_from_community);
 
@@ -1788,7 +1795,8 @@ mod tests {
       Some(data.local_user_view.person.id),
       false,
     )
-    .await?;
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
     assert!(!post_view.banned_from_community);
 
diff --git a/crates/db_views/src/private_message_report_view.rs b/crates/db_views/src/private_message_report_view.rs
index dff9820d99..a402d0d4f7 100644
--- a/crates/db_views/src/private_message_report_view.rs
+++ b/crates/db_views/src/private_message_report_view.rs
@@ -42,7 +42,7 @@ fn queries<'a>() -> Queries<
 
   let read = move |mut conn: DbConn<'a>, report_id: PrivateMessageReportId| async move {
     all_joins(private_message_report::table.find(report_id).into_boxed())
-      .first::<PrivateMessageReportView>(&mut conn)
+      .first(&mut conn)
       .await
   };
 
@@ -77,7 +77,7 @@ impl PrivateMessageReportView {
   pub async fn read(
     pool: &mut DbPool<'_>,
     report_id: PrivateMessageReportId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, report_id).await
   }
 
diff --git a/crates/db_views/src/private_message_view.rs b/crates/db_views/src/private_message_view.rs
index 466f3bdf0a..764ef1dcb9 100644
--- a/crates/db_views/src/private_message_view.rs
+++ b/crates/db_views/src/private_message_view.rs
@@ -53,7 +53,7 @@ fn queries<'a>() -> Queries<
     all_joins(private_message::table.find(private_message_id).into_boxed())
       .order_by(private_message::published.desc())
       .select(selection)
-      .first::<PrivateMessageView>(&mut conn)
+      .first(&mut conn)
       .await
   };
 
@@ -113,7 +113,7 @@ impl PrivateMessageView {
   pub async fn read(
     pool: &mut DbPool<'_>,
     private_message_id: PrivateMessageId,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, private_message_id).await
   }
 
diff --git a/crates/db_views/src/registration_application_view.rs b/crates/db_views/src/registration_application_view.rs
index 85916bb90c..7346dcd0d6 100644
--- a/crates/db_views/src/registration_application_view.rs
+++ b/crates/db_views/src/registration_application_view.rs
@@ -42,7 +42,7 @@ fn queries<'a>() -> Queries<
         .find(registration_application_id)
         .into_boxed(),
     )
-    .first::<RegistrationApplicationView>(&mut conn)
+    .first(&mut conn)
     .await
   };
 
@@ -76,7 +76,7 @@ impl RegistrationApplicationView {
   pub async fn read(
     pool: &mut DbPool<'_>,
     registration_application_id: i32,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, registration_application_id).await
   }
 
@@ -209,6 +209,7 @@ mod tests {
 
     let read_sara_app_view = RegistrationApplicationView::read(pool, sara_app.id)
       .await
+      .unwrap()
       .unwrap();
 
     let jess_person_form = PersonInsertForm::builder()
@@ -240,6 +241,7 @@ mod tests {
 
     let read_jess_app_view = RegistrationApplicationView::read(pool, jess_app.id)
       .await
+      .unwrap()
       .unwrap();
 
     let mut expected_sara_app_view = RegistrationApplicationView {
@@ -343,6 +345,7 @@ mod tests {
 
     let read_sara_app_view_after_approve = RegistrationApplicationView::read(pool, sara_app.id)
       .await
+      .unwrap()
       .unwrap();
 
     // Make sure the columns changed
diff --git a/crates/db_views/src/site_view.rs b/crates/db_views/src/site_view.rs
index 52074c9823..8f07223189 100644
--- a/crates/db_views/src/site_view.rs
+++ b/crates/db_views/src/site_view.rs
@@ -1,5 +1,5 @@
 use crate::structs::SiteView;
-use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
+use diesel::{result::Error, ExpressionMethods, JoinOnDsl, OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
   schema::{local_site, local_site_rate_limit, site, site_aggregates},
@@ -7,7 +7,7 @@ use lemmy_db_schema::{
 };
 
 impl SiteView {
-  pub async fn read_local(pool: &mut DbPool<'_>) -> Result<Self, Error> {
+  pub async fn read_local(pool: &mut DbPool<'_>) -> Result<Option<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     site::table
       .inner_join(local_site::table)
@@ -21,7 +21,8 @@ impl SiteView {
         local_site_rate_limit::all_columns,
         site_aggregates::all_columns,
       ))
-      .first::<SiteView>(conn)
+      .first(conn)
       .await
+      .optional()
   }
 }
diff --git a/crates/db_views_actor/src/comment_reply_view.rs b/crates/db_views_actor/src/comment_reply_view.rs
index 77f744a97e..baa4f56017 100644
--- a/crates/db_views_actor/src/comment_reply_view.rs
+++ b/crates/db_views_actor/src/comment_reply_view.rs
@@ -188,7 +188,7 @@ fn queries<'a>() -> Queries<
         comment_reply::table.find(comment_reply_id).into_boxed(),
         my_person_id,
       )
-      .first::<CommentReplyView>(&mut conn)
+      .first(&mut conn)
       .await
     };
 
@@ -234,7 +234,7 @@ impl CommentReplyView {
     pool: &mut DbPool<'_>,
     comment_reply_id: CommentReplyId,
     my_person_id: Option<PersonId>,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries().read(pool, (comment_reply_id, my_person_id)).await
   }
 
diff --git a/crates/db_views_actor/src/community_view.rs b/crates/db_views_actor/src/community_view.rs
index 3107478dc2..b5c23c6ef5 100644
--- a/crates/db_views_actor/src/community_view.rs
+++ b/crates/db_views_actor/src/community_view.rs
@@ -102,7 +102,7 @@ fn queries<'a>() -> Queries<
       query = query.filter(community::visibility.eq(CommunityVisibility::Public));
     }
 
-    query.first::<CommunityView>(&mut conn).await
+    query.first(&mut conn).await
   };
 
   let list = move |mut conn: DbConn<'a>, (options, site): (CommunityQuery<'a>, &'a Site)| async move {
@@ -194,7 +194,7 @@ impl CommunityView {
     community_id: CommunityId,
     my_person_id: Option<PersonId>,
     is_mod_or_admin: bool,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries()
       .read(pool, (community_id, my_person_id, is_mod_or_admin))
       .await
@@ -209,9 +209,10 @@ impl CommunityView {
       CommunityModeratorView::is_community_moderator(pool, community_id, person_id).await?;
     if is_mod {
       Ok(true)
+    } else if let Ok(Some(person_view)) = PersonView::read(pool, person_id).await {
+      Ok(person_view.is_admin)
     } else {
-      let is_admin = PersonView::read(pool, person_id).await?.is_admin;
-      Ok(is_admin)
+      Ok(false)
     }
   }
 
@@ -223,11 +224,12 @@ impl CommunityView {
     let is_mod_of_any =
       CommunityModeratorView::is_community_moderator_of_any(pool, person_id).await?;
     if is_mod_of_any {
-      return Ok(true);
+      Ok(true)
+    } else if let Ok(Some(person_view)) = PersonView::read(pool, person_id).await {
+      Ok(person_view.is_admin)
+    } else {
+      Ok(false)
     }
-
-    let is_admin = PersonView::read(pool, person_id).await?.is_admin;
-    Ok(is_admin)
   }
 }
 
@@ -384,8 +386,10 @@ mod tests {
     assert_eq!(1, authenticated_query.len());
 
     let unauthenticated_community =
-      CommunityView::read(pool, data.inserted_community.id, None, false).await;
-    assert!(unauthenticated_community.is_err());
+      CommunityView::read(pool, data.inserted_community.id, None, false)
+        .await
+        .unwrap();
+    assert!(unauthenticated_community.is_none());
 
     let authenticated_community = CommunityView::read(
       pool,
diff --git a/crates/db_views_actor/src/person_mention_view.rs b/crates/db_views_actor/src/person_mention_view.rs
index 3998502924..65c0bd0e69 100644
--- a/crates/db_views_actor/src/person_mention_view.rs
+++ b/crates/db_views_actor/src/person_mention_view.rs
@@ -187,7 +187,7 @@ fn queries<'a>() -> Queries<
         person_mention::table.find(person_mention_id).into_boxed(),
         my_person_id,
       )
-      .first::<PersonMentionView>(&mut conn)
+      .first(&mut conn)
       .await
     };
 
@@ -233,7 +233,7 @@ impl PersonMentionView {
     pool: &mut DbPool<'_>,
     person_mention_id: PersonMentionId,
     my_person_id: Option<PersonId>,
-  ) -> Result<Self, Error> {
+  ) -> Result<Option<Self>, Error> {
     queries()
       .read(pool, (person_mention_id, my_person_id))
       .await
diff --git a/crates/db_views_actor/src/person_view.rs b/crates/db_views_actor/src/person_view.rs
index b3eac296d0..5734bc8127 100644
--- a/crates/db_views_actor/src/person_view.rs
+++ b/crates/db_views_actor/src/person_view.rs
@@ -72,7 +72,7 @@ fn queries<'a>(
 
   let read = move |mut conn: DbConn<'a>, person_id: PersonId| async move {
     all_joins(person::table.find(person_id).into_boxed())
-      .first::<PersonView>(&mut conn)
+      .first(&mut conn)
       .await
   };
 
@@ -134,7 +134,7 @@ fn queries<'a>(
 }
 
 impl PersonView {
-  pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Option<Self>, Error> {
     queries().read(pool, person_id).await
   }
 
@@ -163,12 +163,10 @@ impl PersonQuery {
 }
 
 #[cfg(test)]
-#[allow(clippy::unwrap_used)]
 #[allow(clippy::indexing_slicing)]
 mod tests {
 
   use super::*;
-  use diesel::NotFound;
   use lemmy_db_schema::{
     assert_length,
     source::{
@@ -179,7 +177,7 @@ mod tests {
     traits::Crud,
     utils::build_db_pool_for_tests,
   };
-  use lemmy_utils::error::LemmyResult;
+  use lemmy_utils::{error::LemmyResult, LemmyErrorType};
   use pretty_assertions::assert_eq;
   use serial_test::serial;
 
@@ -254,8 +252,8 @@ mod tests {
     )
     .await?;
 
-    let read = PersonView::read(pool, data.alice.id).await;
-    assert_eq!(read.err(), Some(NotFound));
+    let read = PersonView::read(pool, data.alice.id).await?;
+    assert!(read.is_none());
 
     let list = PersonQuery {
       sort: Some(SortType::New),
@@ -314,10 +312,16 @@ mod tests {
     assert_length!(1, list);
     assert_eq!(list[0].person.id, data.alice.id);
 
-    let is_admin = PersonView::read(pool, data.alice.id).await?.is_admin;
+    let is_admin = PersonView::read(pool, data.alice.id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?
+      .is_admin;
     assert!(is_admin);
 
-    let is_admin = PersonView::read(pool, data.bob.id).await?.is_admin;
+    let is_admin = PersonView::read(pool, data.bob.id)
+      .await?
+      .ok_or(LemmyErrorType::CouldntFindPerson)?
+      .is_admin;
     assert!(!is_admin);
 
     cleanup(data, pool).await
diff --git a/crates/federate/src/util.rs b/crates/federate/src/util.rs
index cedf3387f8..b057ab0fec 100644
--- a/crates/federate/src/util.rs
+++ b/crates/federate/src/util.rs
@@ -151,7 +151,6 @@ pub(crate) async fn get_activity_cached(
     .try_get_with(activity_id, async {
       let row = SentActivity::read(pool, activity_id)
         .await
-        .optional()
         .context("could not read activity")?;
       let Some(mut row) = row else {
         return anyhow::Result::<_, anyhow::Error>::Ok(None);
diff --git a/crates/routes/src/feeds.rs b/crates/routes/src/feeds.rs
index 2c29f192e7..5e3db357a8 100644
--- a/crates/routes/src/feeds.rs
+++ b/crates/routes/src/feeds.rs
@@ -152,7 +152,9 @@ async fn get_feed_data(
   limit: i64,
   page: i64,
 ) -> LemmyResult<HttpResponse> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
 
   check_private_instance(&None, &site_view.local_site)?;
 
@@ -257,8 +259,12 @@ async fn get_feed_user(
   page: &i64,
   user_name: &str,
 ) -> LemmyResult<Channel> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
-  let person = Person::read_from_name(&mut context.pool(), user_name, false).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
+  let person = Person::read_from_name(&mut context.pool(), user_name, false)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   check_private_instance(&None, &site_view.local_site)?;
 
@@ -293,8 +299,12 @@ async fn get_feed_community(
   page: &i64,
   community_name: &str,
 ) -> LemmyResult<Channel> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
-  let community = Community::read_from_name(&mut context.pool(), community_name, false).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
+  let community = Community::read_from_name(&mut context.pool(), community_name, false)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   if community.visibility != CommunityVisibility::Public {
     return Err(LemmyErrorType::CouldntFindCommunity.into());
   }
@@ -336,7 +346,9 @@ async fn get_feed_front(
   page: &i64,
   jwt: &str,
 ) -> LemmyResult<Channel> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let local_user = local_user_view_from_jwt(jwt, context).await?;
 
   check_private_instance(&Some(local_user.clone()), &site_view.local_site)?;
@@ -371,7 +383,9 @@ async fn get_feed_front(
 
 #[tracing::instrument(skip_all)]
 async fn get_feed_inbox(context: &LemmyContext, jwt: &str) -> LemmyResult<Channel> {
-  let site_view = SiteView::read_local(&mut context.pool()).await?;
+  let site_view = SiteView::read_local(&mut context.pool())
+    .await?
+    .ok_or(LemmyErrorType::LocalSiteNotSetup)?;
   let local_user = local_user_view_from_jwt(jwt, context).await?;
   let person_id = local_user.local_user.person_id;
   let show_bot_accounts = local_user.local_user.show_bot_accounts;
diff --git a/crates/routes/src/lib.rs b/crates/routes/src/lib.rs
index a882256223..4f8d602462 100644
--- a/crates/routes/src/lib.rs
+++ b/crates/routes/src/lib.rs
@@ -1,6 +1,6 @@
 use lemmy_api_common::{claims::Claims, context::LemmyContext, utils::check_user_valid};
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::LemmyResult;
+use lemmy_utils::{error::LemmyResult, LemmyErrorType};
 
 pub mod feeds;
 pub mod images;
@@ -10,7 +10,9 @@ pub mod webfinger;
 #[tracing::instrument(skip_all)]
 async fn local_user_view_from_jwt(jwt: &str, context: &LemmyContext) -> LemmyResult<LocalUserView> {
   let local_user_id = Claims::validate(jwt, context).await?;
-  let local_user_view = LocalUserView::read(&mut context.pool(), local_user_id).await?;
+  let local_user_view = LocalUserView::read(&mut context.pool(), local_user_id)
+    .await?
+    .ok_or(LemmyErrorType::CouldntFindLocalUser)?;
   check_user_valid(&local_user_view.person)?;
 
   Ok(local_user_view)
diff --git a/crates/routes/src/nodeinfo.rs b/crates/routes/src/nodeinfo.rs
index b5db4e9659..dbb2ef68ab 100644
--- a/crates/routes/src/nodeinfo.rs
+++ b/crates/routes/src/nodeinfo.rs
@@ -40,7 +40,8 @@ async fn node_info_well_known(context: web::Data<LemmyContext>) -> LemmyResult<H
 async fn node_info(context: web::Data<LemmyContext>) -> Result<HttpResponse, Error> {
   let site_view = SiteView::read_local(&mut context.pool())
     .await
-    .map_err(|_| ErrorBadRequest(LemmyError::from(anyhow!("not_found"))))?;
+    .map_err(|_| ErrorBadRequest(LemmyError::from(anyhow!("not_found"))))?
+    .ok_or(ErrorBadRequest(LemmyError::from(anyhow!("not_found"))))?;
 
   let protocols = if site_view.local_site.federation_enabled {
     Some(vec!["activitypub".to_string()])
diff --git a/crates/routes/src/webfinger.rs b/crates/routes/src/webfinger.rs
index 36dd970791..6c630df4ce 100644
--- a/crates/routes/src/webfinger.rs
+++ b/crates/routes/src/webfinger.rs
@@ -47,10 +47,12 @@ async fn get_webfinger_response(
     let user_id: Option<Url> = Person::read_from_name(&mut context.pool(), name, false)
       .await
       .ok()
+      .flatten()
       .map(|c| c.actor_id.into());
     let community_id: Option<Url> = Community::read_from_name(&mut context.pool(), name, false)
       .await
       .ok()
+      .flatten()
       .and_then(|c| {
         if c.visibility == CommunityVisibility::Public {
           let id: Url = c.actor_id.into();
diff --git a/crates/utils/src/error.rs b/crates/utils/src/error.rs
index cc6897edde..a687f51362 100644
--- a/crates/utils/src/error.rs
+++ b/crates/utils/src/error.rs
@@ -43,6 +43,16 @@ pub enum LemmyErrorType {
   BannedFromCommunity,
   CouldntFindCommunity,
   CouldntFindPerson,
+  CouldntFindComment,
+  CouldntFindCommentReport,
+  CouldntFindPostReport,
+  CouldntFindPrivateMessageReport,
+  CouldntFindLocalUser,
+  CouldntFindPersonMention,
+  CouldntFindRegistrationApplication,
+  CouldntFindCommentReply,
+  CouldntFindPrivateMessage,
+  CouldntFindActivity,
   PersonIsBlocked,
   CommunityIsBlocked,
   InstanceIsBlocked,
@@ -92,6 +102,7 @@ pub enum LemmyErrorType {
   PageDoesNotSpecifyGroup,
   NoCommunityFoundInCc,
   NoEmailSetup,
+  LocalSiteNotSetup,
   EmailSmtpServerNeedsAPort,
   MissingAnEmail,
   RateLimitError,
diff --git a/src/code_migrations.rs b/src/code_migrations.rs
index a2325971b8..05b564f474 100644
--- a/src/code_migrations.rs
+++ b/src/code_migrations.rs
@@ -345,7 +345,7 @@ async fn instance_actor_2022_01_28(
   settings: &Settings,
 ) -> LemmyResult<()> {
   info!("Running instance_actor_2021_09_29");
-  if let Ok(site_view) = SiteView::read_local(pool).await {
+  if let Ok(Some(site_view)) = SiteView::read_local(pool).await {
     let site = site_view.site;
     // if site already has public key, we dont need to do anything here
     if !site.public_key.is_empty() {
diff --git a/src/lib.rs b/src/lib.rs
index 00960826a2..12a0f4a7db 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -124,12 +124,12 @@ pub async fn start_lemmy_server(args: CmdArgs) -> LemmyResult<()> {
 
   // Initialize the secrets
   let secret = Secret::init(&mut (&pool).into())
-    .await
+    .await?
     .expect("Couldn't initialize secrets.");
 
   // Make sure the local site is set up.
   let site_view = SiteView::read_local(&mut (&pool).into())
-    .await
+    .await?
     .expect("local site not set up");
   let local_site = site_view.local_site;
   let federation_enabled = local_site.federation_enabled;
diff --git a/src/session_middleware.rs b/src/session_middleware.rs
index 2bee64ca0e..f4535249c0 100644
--- a/src/session_middleware.rs
+++ b/src/session_middleware.rs
@@ -130,7 +130,7 @@ mod tests {
 
     let pool_ = build_db_pool_for_tests().await;
     let pool = &mut (&pool_).into();
-    let secret = Secret::init(pool).await.unwrap();
+    let secret = Secret::init(pool).await.unwrap().unwrap();
     let context = LemmyContext::create(
       pool_.clone(),
       ClientBuilder::new(Client::default()).build(),