diff --git a/lib/aprsme/db_optimizer.ex b/lib/aprsme/db_optimizer.ex
index c022503..47b91c9 100644
--- a/lib/aprsme/db_optimizer.ex
+++ b/lib/aprsme/db_optimizer.ex
@@ -66,8 +66,10 @@ defmodule Aprsme.DbOptimizer do
           opts
         )
 
-      case Repo.insert_all(schema, batch, insert_opts) do
-        {count, _} -> {:ok, count}
+      try do
+        {count, _} = Repo.insert_all(schema, batch, insert_opts)
+        {:ok, count}
+      rescue
         error -> {:error, error}
       end
     end)
diff --git a/lib/aprsme/packets.ex b/lib/aprsme/packets.ex
index d27f63a..8bca3fc 100644
--- a/lib/aprsme/packets.ex
+++ b/lib/aprsme/packets.ex
@@ -382,7 +382,7 @@ defmodule Aprsme.Packets do
     bounds = Map.get(opts, :bounds)
 
     query =
-      Packet
+      from(p in Packet)
       |> QueryBuilder.with_position()
       |> QueryBuilder.with_time_range(opts)
       |> QueryBuilder.maybe_filter_region(opts)
@@ -416,7 +416,7 @@ defmodule Aprsme.Packets do
     bounds = Map.get(opts, :bounds)
 
     query =
-      Packet
+      from(p in Packet)
       |> QueryBuilder.with_position()
       |> QueryBuilder.with_time_range(opts)
       |> QueryBuilder.maybe_filter_region(opts)