diff --git a/pkg/notifications/constants.go b/pkg/notifications/constants.go
index 3faaf5f7e23..3829e3945f8 100644
--- a/pkg/notifications/constants.go
+++ b/pkg/notifications/constants.go
@@ -7,7 +7,8 @@ const MyMoveLink = "https://my.move.mil/"
 const WashingtonHQServicesLink = "https://www.esd.whs.mil"
 const SmartVoucherLink = "https://smartvoucher.dfas.mil/"
 
-const DtodErrorMessage = "We are unable to calculate your distance. It may be that you have entered an invalid ZIP Code, or the system that calculates distance (DTOD) may be down. Please check your ZIP Code to ensure it was entered correctly and is not a PO Box."
+const DTODFailureErrorMessage = "We are unable to calculate your distance. It may be that you have entered an invalid ZIP Code, or the system that calculates distance (DTOD) may be down. Please check your ZIP Code to ensure it was entered correctly and is not a PO Box."
+const DTODDownErrorMessage = "We are having an issue with the system we use to calculate mileage (DTOD) and cannot proceed."
 
 var affiliationDisplayValue = map[models.ServiceMemberAffiliation]string{
 	models.AffiliationARMY:       "Army",
diff --git a/pkg/route/dtod_zip5_distance.go b/pkg/route/dtod_zip5_distance.go
index 2242d5320cf..fce3149d596 100644
--- a/pkg/route/dtod_zip5_distance.go
+++ b/pkg/route/dtod_zip5_distance.go
@@ -106,11 +106,15 @@ func (d *dtodZip5DistanceInfo) DTODZip5Distance(appCtx appcontext.AppContext, pi
 
 	if distanceFloat <= 0 {
 		dtodAvailable, _ := validateDTODServiceAvailable(*d)
-		if !dtodAvailable && appCtx.Session().IsServiceMember() {
-			return distance, nil
+		if !dtodAvailable {
+			if appCtx.Session().IsServiceMember() {
+				return distance, nil
+			} else {
+				return distance, apperror.NewEventError(notifications.DTODDownErrorMessage, nil)
+			}
 		}
 
-		return distance, apperror.NewEventError(notifications.DtodErrorMessage, nil)
+		return distance, apperror.NewEventError(notifications.DTODFailureErrorMessage, nil)
 	}
 
 	// TODO: DTOD gives us a float back. Should we round, floor, or ceiling? Just going to round for now.
diff --git a/pkg/route/dtod_zip5_distance_test.go b/pkg/route/dtod_zip5_distance_test.go
index 96d0a0d1572..4fc128f2d3b 100644
--- a/pkg/route/dtod_zip5_distance_test.go
+++ b/pkg/route/dtod_zip5_distance_test.go
@@ -98,7 +98,7 @@ func (suite *GHCTestSuite) TestDTODZip5DistanceFake() {
 				suite.Error(err)
 				switch err.(type) {
 				case apperror.EventError:
-					suite.Equal(err.Error(), notifications.DtodErrorMessage)
+					suite.Equal(err.Error(), notifications.DTODDownErrorMessage)
 				}
 			} else {
 				suite.NoError(err)
diff --git a/src/components/Office/ShipmentForm/ShipmentForm.jsx b/src/components/Office/ShipmentForm/ShipmentForm.jsx
index 333e7ad29c4..5d24e7e5e16 100644
--- a/src/components/Office/ShipmentForm/ShipmentForm.jsx
+++ b/src/components/Office/ShipmentForm/ShipmentForm.jsx
@@ -820,7 +820,7 @@ const ShipmentForm = (props) => {
               <Alert data-testid="errorMessage" type="error" headingLevel="h4" heading="An error occurred">
                 {errorCode === 400 ? (
                   <p>
-                    {errorMessage} If the error persists, please try again later, or contact the&nbsp;
+                    {errorMessage} Please try again later, or contact the&nbsp;
                     <Link to={technicalHelpDeskURL} target="_blank" rel="noreferrer">
                       Technical Help Desk
                     </Link>
diff --git a/src/scenes/Moves/WizardHeader.css b/src/scenes/Moves/WizardHeader.css
deleted file mode 100644
index 2a9f5dcb7b3..00000000000
--- a/src/scenes/Moves/WizardHeader.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.wizard-header .icon {
-  margin: 0;
-  margin-right: 1rem;
-  max-width: 75px;
-}
-
-.icon {
-  height: 75;
-  width: auto;
-}
-
-.wizard-header h1 {
-  margin: 0;
-}
diff --git a/src/scenes/Moves/WizardHeader.jsx b/src/scenes/Moves/WizardHeader.jsx
deleted file mode 100644
index 002dee94fcb..00000000000
--- a/src/scenes/Moves/WizardHeader.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import './WizardHeader.css';
-
-const WizardHeader = ({ icon, right, title }) => (
-  <div className="wizard-header">
-    <div className="grid-row grid-gap">
-      <div className="tablet:grid-col-6 desktop:grid-col-8 wizard-left">
-        {icon && <img className="icon" src={icon} alt="" />}
-        <h1>{title}</h1>
-      </div>
-      <div className="tablet:grid-col-6 desktop:grid-col-4 wizard-right">{right}</div>
-    </div>
-    <div className="grid-row">
-      <div className="grid-row-12">
-        <hr />
-      </div>
-    </div>
-  </div>
-);
-
-WizardHeader.defaultProps = {
-  title: <span>&nbsp;</span>,
-};
-
-WizardHeader.propTypes = {
-  icon: PropTypes.string,
-  title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-  right: PropTypes.element,
-};
-
-export default WizardHeader;