diff --git a/src/callers/login.rs b/src/callers/login.rs
index 5772d86..396fff6 100644
--- a/src/callers/login.rs
+++ b/src/callers/login.rs
@@ -96,7 +96,7 @@ pub mod endpoint {
             Ok(user) => {
                 if hashing::verify_password(&payload.password, user.password.clone()).unwrap() {
                     // Create token
-                    let key = icarus_envy::environment::get_secret_key().await;
+                    let key = icarus_envy::environment::get_secret_key().await.value;
                     let (token_literal, duration) =
                         token_stuff::create_token(&key, &user.id).unwrap();
 
@@ -155,7 +155,7 @@ pub mod endpoint {
 
         match repo::service::valid_passphrase(&pool, &payload.passphrase).await {
             Ok((id, _passphrase, _date_created)) => {
-                let key = icarus_envy::environment::get_secret_key().await;
+                let key = icarus_envy::environment::get_secret_key().await.value;
                 let (token_literal, duration) =
                     token_stuff::create_service_token(&key, &id).unwrap();
 
@@ -207,7 +207,7 @@ pub mod endpoint {
         axum::Json<response::refresh_token::Response>,
     ) {
         let mut response = response::refresh_token::Response::default();
-        let key = icarus_envy::environment::get_secret_key().await;
+        let key = icarus_envy::environment::get_secret_key().await.value;
 
         if token_stuff::verify_token(&key, &payload.access_token) {
             let token_type = token_stuff::get_token_type(&key, &payload.access_token).unwrap();
diff --git a/src/lib.rs b/src/lib.rs
index 75c5de2..19c66a2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,7 +16,7 @@ pub mod db {
     use crate::connection_settings;
 
     pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-        let database_url = icarus_envy::environment::get_db_url().await;
+        let database_url = icarus_envy::environment::get_db_url().await.value;
         println!("Database url: {database_url}");
 
         PgPoolOptions::new()
diff --git a/src/main.rs b/src/main.rs
index 0a290b1..d228321 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -66,11 +66,16 @@ mod init {
             match std::env::var(icarus_envy::keys::APP_ENV).as_deref() {
                 Ok("production") => {
                     let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await;
-                    let allowed_origins: Vec<axum::http::HeaderValue> = allowed_origins_env
-                        .split(",")
-                        .map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
-                        .collect();
-                    cors.allow_origin(allowed_origins)
+                    match icarus_envy::utility::delimitize(&allowed_origins_env) {
+                        Ok(alwd) => {
+                            let allowed_origins: Vec<axum::http::HeaderValue> = alwd.into_iter().map(|s| s.parse::<axum::http::HeaderValue>().unwrap()).collect();
+                            cors.allow_origin(allowed_origins)
+                        }
+                        Err(err) => {
+                            eprintln!("Could not parse out allowed origins from env: Error: {err:?}");
+                            std::process::exit(-1);
+                        }
+                    }
                 }
                 _ => {
                     // Development (default): Allow localhost origins
diff --git a/src/token_stuff/mod.rs b/src/token_stuff/mod.rs
index 64e4429..d260352 100644
--- a/src/token_stuff/mod.rs
+++ b/src/token_stuff/mod.rs
@@ -124,7 +124,7 @@ mod tests {
     #[test]
     fn test_tokenize() {
         let rt = tokio::runtime::Runtime::new().unwrap();
-        let special_key = rt.block_on(icarus_envy::environment::get_secret_key());
+        let special_key = rt.block_on(icarus_envy::environment::get_secret_key()).value;
         let id = uuid::Uuid::new_v4();
         match create_token(&special_key, &id) {
             Ok((token, _duration)) => {