diff --git a/openlr/candidate_paths_getter.hpp b/openlr/candidate_paths_getter.hpp
index ceb790bd82..a0042595f0 100644
--- a/openlr/candidate_paths_getter.hpp
+++ b/openlr/candidate_paths_getter.hpp
@@ -86,11 +86,9 @@ private:
     bool HasFakeEndings() const { return m_path && m_path->m_hasFake; }
 
     LinkPtr m_path = nullptr;
-    uint32_t m_bearingDiff = std::numeric_limits<uint32_t>::max();  // Domain is roughly [0, 30]
-    double m_pathDistanceDiff =
-        std::numeric_limits<uint32_t>::max();  // Domain is roughly [0, 25]
-    double m_startPointDistance =
-        std::numeric_limits<uint32_t>::max();  // Domain is roughly [0, 50]
+    uint32_t m_bearingDiff = std::numeric_limits<uint32_t>::max();     // Domain is roughly [0, 30]
+    double m_pathDistanceDiff = std::numeric_limits<double>::max();    // Domain is roughly [0, 25]
+    double m_startPointDistance = std::numeric_limits<double>::max();  // Domain is roughly [0, 50]
   };
 
   // Note: In all methods below if |isLastPoint| is true than algorithm should
diff --git a/openlr/openlr_decoder.cpp b/openlr/openlr_decoder.cpp
index 1e6abaa93a..0ebcf2a682 100644
--- a/openlr/openlr_decoder.cpp
+++ b/openlr/openlr_decoder.cpp
@@ -124,6 +124,8 @@ void ExpandFakes(Index const & index, Graph & g, Graph::EdgeVector & path)
   ASSERT(!path.empty(), ());
 
   ExpandFake(path, begin(path), index, g);
+  if (path.empty())
+    return;
   ExpandFake(path, --end(path), index, g);
 }
 
@@ -365,6 +367,7 @@ bool OpenLRDecoder::DecodeSingleSegment(LinearSegment const & segment, Index con
   path.m_segmentId.Set(segment.m_segmentId);
 
   auto const & points = segment.GetLRPs();
+  CHECK_GREATER(points.size(), 1, ("A segment cannot consist of less than two points"));
   vector<vector<Graph::EdgeVector>> lineCandidates;
   lineCandidates.reserve(points.size());
   LOG(LDEBUG, ("Decoding segment:", segment.m_segmentId, "with", points.size(), "points"));