diff --git a/app/component/ItineraryListContainer.js b/app/component/ItineraryListContainer.js
index 9fc823a7a9..93aa12cd1f 100644
--- a/app/component/ItineraryListContainer.js
+++ b/app/component/ItineraryListContainer.js
@@ -254,6 +254,8 @@ class ItineraryListContainer extends React.Component {
       driving,
       hasNoTransitItineraries,
       settingsNotification,
+      error,
+      routingErrors,
     } = this.props;
 
     const searchTime =
@@ -284,8 +286,8 @@ class ItineraryListContainer extends React.Component {
           activeIndex={activeIndex}
           currentTime={currentTime}
           locationState={locationState}
-          error={this.props.error}
-          routingErrors={this.props.routingErrors}
+          error={error}
+          routingErrors={routingErrors}
           from={otpToLocation(from)}
           intermediatePlaces={getIntermediatePlaces(location.query)}
           itineraries={itineraries}
diff --git a/app/component/ItineraryPage.js b/app/component/ItineraryPage.js
index c920b21fde..ea8c1e26e9 100644
--- a/app/component/ItineraryPage.js
+++ b/app/component/ItineraryPage.js
@@ -320,7 +320,7 @@ class ItineraryPage extends React.Component {
 
         const parkRidePlan = {
           ...result.parkRidePlan,
-          itineraries: transitItineraries(result.parkRidePlan.itineraries),
+          itineraries: transitItineraries(result.parkRidePlan?.itineraries),
         };
 
         this.setState(
@@ -369,7 +369,7 @@ class ItineraryPage extends React.Component {
     }).then(result => {
       const relaxedPlan = {
         ...result.plan,
-        itineraries: transitItineraries(result.plan.itineraries),
+        itineraries: transitItineraries(result.plan?.itineraries),
       };
       this.setState({
         relaxedPlan,