diff --git a/lib/berrypod_web/controllers/stripe_webhook_controller.ex b/lib/berrypod_web/controllers/stripe_webhook_controller.ex
index 13418be..3891ab0 100644
--- a/lib/berrypod_web/controllers/stripe_webhook_controller.ex
+++ b/lib/berrypod_web/controllers/stripe_webhook_controller.ex
@@ -26,7 +26,7 @@ defmodule BerrypodWeb.StripeWebhookController do
   end
 
   defp handle_event(%Stripe.Event{type: "checkout.session.completed", data: %{object: session}}) do
-    order_id = get_in(session, [:metadata, "order_id"]) || session.metadata["order_id"]
+    order_id = session.metadata["order_id"]
 
     case Orders.get_order(order_id) do
       nil ->
@@ -85,7 +85,7 @@ defmodule BerrypodWeb.StripeWebhookController do
   end
 
   defp handle_event(%Stripe.Event{type: "checkout.session.expired", data: %{object: session}}) do
-    order_id = get_in(session, [:metadata, "order_id"]) || session.metadata["order_id"]
+    order_id = session.metadata["order_id"]
 
     case Orders.get_order(order_id) do
       nil -> :ok
@@ -116,7 +116,7 @@ defmodule BerrypodWeb.StripeWebhookController do
   end
 
   defp update_shipping_cost(order, session) do
-    shipping_amount = get_in(session, [Access.key(:shipping_cost), Access.key(:amount_total)])
+    shipping_amount = session.shipping_cost && session.shipping_cost.amount_total
 
     if is_integer(shipping_amount) and shipping_amount > 0 do
       new_total = order.subtotal + shipping_amount