diff --git a/src/main.rs b/src/main.rs
index 93e957b..33e7cec 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -108,8 +108,12 @@ async fn main() {
 
     let socket = SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), state.config.port);
     info!("Serving Karnaugh on socket {}", socket);
-    let listener = tokio::net::TcpListener::bind(socket).await.unwrap();
-    axum::serve(listener, app).await.unwrap();
+    let listener = tokio::net::TcpListener::bind(socket)
+        .await
+        .expect(&format!("Failed to bind to socket {}", socket));
+    axum::serve(listener, app)
+        .await
+        .expect("Failed to serve site");
 }
 
 async fn root_handler(State(state): State<AppState>) -> impl IntoResponse {
diff --git a/src/typst/mod.rs b/src/typst/mod.rs
index c1c718d..c6ec81b 100644
--- a/src/typst/mod.rs
+++ b/src/typst/mod.rs
@@ -138,7 +138,10 @@ impl<'a> DocumentWorld<'a> {
     }
 
     fn get_package(&self, spec: &PackageSpec) -> PackageResult<PathBuf> {
-        let path = get_package_path(&VirtualPath::new("").unwrap(), spec);
+        let path = get_package_path(
+            &VirtualPath::new("").expect("Failed to create empty virtual path"),
+            spec,
+        );
         let path = path.realize(&self.context.config.packages_root);
 
         if path.exists() {
@@ -177,6 +180,9 @@ impl<'a> DocumentWorld<'a> {
 }
 
 fn get_package_path(file_path: &VirtualPath, spec: &PackageSpec) -> VirtualPath {
-    let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version)).unwrap();
-    package_path.join(file_path.get_without_slash()).unwrap()
+    let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version))
+        .expect("Failed to create virtual path representing package path.");
+    package_path
+        .join(file_path.get_without_slash())
+        .expect("Failed to join file path into package path.")
 }