diff --git a/emmet-core/emmet/core/neb.py b/emmet-core/emmet/core/neb.py
index fcd854609..4548dda7a 100644
--- a/emmet-core/emmet/core/neb.py
+++ b/emmet-core/emmet/core/neb.py
@@ -128,8 +128,12 @@ class NebTaskDoc(BaseModel, extra="allow"):
     @model_validator(mode="after")
     def set_barriers(self) -> Self:
         """Perform analysis on barrier if needed."""
-        if not self.forward_barrier or not self.reverse_barrier:
-            self.barrier_analysis = neb_barrier_spline_fit(self.energies)
+        if (
+            not self.forward_barrier
+            or not self.reverse_barrier
+            and self.energies is not None
+        ):
+            self.barrier_analysis = neb_barrier_spline_fit(self.energies)  # type: ignore[arg-type]
             for k in ("forward", "reverse"):
                 setattr(self, f"{k}_barrier", self.barrier_analysis[f"{k}_barrier"])
         return self
@@ -140,10 +144,10 @@ def num_images(self) -> int:
         return len(self.image_directories)
 
     @property
-    def energies(self) -> list[float]:
+    def energies(self) -> list[float] | None:
         """Return the endpoint (optional) and image energies."""
         if self.endpoint_energies is not None:
-            return [
+            return [  # type: ignore[misc]
                 self.endpoint_energies[0],
                 *self.image_energies,
                 self.endpoint_energies[1],
@@ -345,7 +349,7 @@ def neb_barrier_spline_fit(
         "energies": list(energies),
         "frame_index": list(frame_idx := np.linspace(0.0, 1.0, len(energies))),
     }
-    energies = np.array(energies)
+    energies = np.array(energies)  # type: ignore[assignment]
 
     spline_kwargs = spline_kwargs or {"bc_type": "clamped"}
     spline_fit = CubicSpline(frame_idx, energies, **spline_kwargs)