Normalize panic message and return 400 or 404 when suitable

src/routes/errors.rs

@@ -6,21 +6,21 @@ use plume_models::users::User;
 
 #[catch(404)]
 fn not_found(req: &Request) -> Template {
-    let conn = req.guard::<DbConn>().expect("404: DbConn error");
+    let conn = req.guard::<DbConn>().succeeded();
     let user = User::from_request(req).succeeded();
     Template::render("errors/404", json!({
         "error_message": "Page not found",
-        "account": user.map(|u| u.to_json(&*conn))
+        "account": user.and_then(|u| conn.map(|conn| u.to_json(&*conn)))
     }))
 }
 
 #[catch(500)]
 fn server_error(req: &Request) -> Template {
-    let conn = req.guard::<DbConn>().expect("500: DbConn error");
+    let conn = req.guard::<DbConn>().succeeded();
     let user = User::from_request(req).succeeded();
     Template::render("errors/500", json!({
         "error_message": "Server error",
-        "account": user.map(|u| u.to_json(&*conn))
+        "account": user.and_then(|u| conn.map(|conn| u.to_json(&*conn)))
     }))
 }