diff --git a/app/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.tsx b/app/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.tsx
index 6ffe982ab6..4259c5b422 100644
--- a/app/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.tsx
+++ b/app/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.tsx
@@ -62,6 +62,11 @@ class NewApplicationDisclaimer extends Component<Props> {
       latestDraftRevision
     } = application;
 
+    if (!applicationRevision || !latestDraftRevision) {
+      router.push('/404');
+      return null;
+    }
+
     if (
       latestDraftRevision.versionNumber !== applicationRevision.versionNumber
     ) {
diff --git a/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/__snapshots__/view.test.tsx.snap b/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/__snapshots__/view.test.tsx.snap
index 585b262ba3..5bee99db4a 100644
--- a/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/__snapshots__/view.test.tsx.snap
+++ b/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/__snapshots__/view.test.tsx.snap
@@ -63,6 +63,13 @@ exports[`View submitted application page displays a "Resume latest draft" button
         </Link>
       </ApplicationDecision>
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -71,7 +78,6 @@ exports[`View submitted application page displays a "Resume latest draft" button
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -91,6 +97,11 @@ exports[`View submitted application page displays a "Resume latest draft" button
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "REQUESTED_CHANGES",
               },
@@ -159,7 +170,6 @@ exports[`View submitted application page displays a "Revise" button when changes
           application={
             Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -179,6 +189,11 @@ exports[`View submitted application page displays a "Revise" button when changes
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "REQUESTED_CHANGES",
               },
@@ -197,6 +212,13 @@ exports[`View submitted application page displays a "Revise" button when changes
         />
       </ApplicationDecision>
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -205,7 +227,6 @@ exports[`View submitted application page displays a "Revise" button when changes
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -225,6 +246,11 @@ exports[`View submitted application page displays a "Revise" button when changes
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "REQUESTED_CHANGES",
               },
@@ -281,6 +307,13 @@ exports[`View submitted application page does not show an application decision w
       md={12}
     >
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -289,7 +322,6 @@ exports[`View submitted application page does not show an application decision w
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -309,6 +341,11 @@ exports[`View submitted application page does not show an application decision w
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "SUBMITTED",
               },
@@ -426,6 +463,13 @@ exports[`View submitted application page should render a "View most recent submi
         }
       />
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -434,7 +478,6 @@ exports[`View submitted application page should render a "View most recent submi
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -454,6 +497,11 @@ exports[`View submitted application page should render a "View most recent submi
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "REQUESTED_CHANGES",
               },
@@ -571,6 +619,13 @@ exports[`View submitted application page should render a "View most recent submi
         }
       />
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -579,7 +634,6 @@ exports[`View submitted application page should render a "View most recent submi
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -599,6 +653,11 @@ exports[`View submitted application page should render a "View most recent submi
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "REQUESTED_CHANGES",
               },
@@ -664,6 +723,13 @@ exports[`View submitted application page shows approval when reviewed and approv
         }
       />
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -672,7 +738,6 @@ exports[`View submitted application page shows approval when reviewed and approv
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -692,6 +757,11 @@ exports[`View submitted application page shows approval when reviewed and approv
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "APPROVED",
               },
@@ -757,6 +827,13 @@ exports[`View submitted application page shows rejection when reviewed and rejec
         }
       />
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -765,7 +842,6 @@ exports[`View submitted application page shows rejection when reviewed and rejec
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -785,6 +861,11 @@ exports[`View submitted application page shows rejection when reviewed and rejec
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "REJECTED",
               },
@@ -850,6 +931,13 @@ exports[`View submitted application page shows reviewer comments when reviewed a
         }
       />
       <Relay(ApplicationDetailsComponent)
+        applicationRevision={
+          Object {
+            " $fragmentRefs": Object {
+              "ApplicationDetailsContainer_applicationRevision": true,
+            },
+          }
+        }
         liveValidate={false}
         query={
           Object {
@@ -858,7 +946,6 @@ exports[`View submitted application page shows reviewer comments when reviewed a
             },
             "application": Object {
               " $fragmentRefs": Object {
-                "ApplicationDetailsContainer_application": true,
                 "ReviseApplicationButtonContainer_application": true,
               },
               "applicationReviewStepsByApplicationId": Object {
@@ -878,6 +965,11 @@ exports[`View submitted application page shows reviewer comments when reviewed a
                   },
                 ],
               },
+              "applicationRevisionByStringVersionNumber": Object {
+                " $fragmentRefs": Object {
+                  "ApplicationDetailsContainer_applicationRevision": true,
+                },
+              },
               "applicationRevisionStatus": Object {
                 "applicationRevisionStatus": "REJECTED",
               },
diff --git a/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.test.tsx b/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.test.tsx
index 759d2e800e..9d8801e4cc 100644
--- a/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.test.tsx
+++ b/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/disclaimer.test.tsx
@@ -24,21 +24,26 @@ const query: disclaimerNewApplicationQueryResponse['query'] = {
   }
 };
 
-const router = {
-  query: {
-    applicationId: 'skjdh839',
-    hasSwrsReport: true,
-    version: 1
-  }
-};
-
 describe('Interstitial application legal disclaimer page', () => {
+  let router;
+  beforeEach(() => {
+    router = {
+      query: {
+        applicationId: 'skjdh839',
+        hasSwrsReport: true,
+        version: 1
+      },
+      push: jest.fn()
+    };
+  });
+
   it('matches the last accepted Snapshot', () => {
     const wrapper = shallow(
       <NewApplicationDisclaimer query={query} router={router} />
     );
     expect(wrapper).toMatchSnapshot();
   });
+
   it('passes an application to the ApplicationConsent component', () => {
     const wrapper = shallow(
       <NewApplicationDisclaimer query={query} router={router} />
@@ -50,4 +55,52 @@ describe('Interstitial application legal disclaimer page', () => {
         .prop('applicationRevision')
     ).toBe(query.application.applicationRevisionByStringVersionNumber);
   });
+
+  it('redirects to the 404 page if the application is missing', () => {
+    const wrapper = shallow(
+      <NewApplicationDisclaimer
+        query={{...query, application: null}}
+        router={router}
+      />
+    );
+
+    expect(wrapper).toBeEmpty();
+    expect(router.push).toBeCalledWith('/404');
+  });
+
+  it('redirects to the 404 page if the application revision by version number is missing', () => {
+    const wrapper = shallow(
+      <NewApplicationDisclaimer
+        query={{
+          ...query,
+          application: {
+            ...query.application,
+            applicationRevisionByStringVersionNumber: null
+          }
+        }}
+        router={router}
+      />
+    );
+
+    expect(wrapper).toBeEmpty();
+    expect(router.push).toBeCalledWith('/404');
+  });
+
+  it('redirects to the 404 page if the application latest draft revision missing', () => {
+    const wrapper = shallow(
+      <NewApplicationDisclaimer
+        query={{
+          ...query,
+          application: {
+            ...query.application,
+            latestDraftRevision: null
+          }
+        }}
+        router={router}
+      />
+    );
+
+    expect(wrapper).toBeEmpty();
+    expect(router.push).toBeCalledWith('/404');
+  });
 });
diff --git a/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/view.test.tsx b/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/view.test.tsx
index 9322ef253c..7a95356545 100644
--- a/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/view.test.tsx
+++ b/app/tests/unit/pages/reporter/application/[applicationId]/version/[versionNumber]/view.test.tsx
@@ -4,7 +4,7 @@ import ViewApplication from 'pages/reporter/application/[applicationId]/version/
 import {viewApplicationQueryResponse} from 'viewApplicationQuery.graphql';
 
 const getTestQuery = (options?) => {
-  return {
+  const data: viewApplicationQueryResponse['query'] = {
     ' $fragmentRefs': {
       ApplicationDetailsContainer_query: true
     },
@@ -45,12 +45,17 @@ const getTestQuery = (options?) => {
           }
         ]
       },
+      applicationRevisionByStringVersionNumber: {
+        ' $fragmentRefs': {
+          ApplicationDetailsContainer_applicationRevision: true
+        }
+      },
       ' $fragmentRefs': {
-        ReviseApplicationButtonContainer_application: true,
-        ApplicationDetailsContainer_application: true
+        ReviseApplicationButtonContainer_application: true
       }
     }
   };
+  return data;
 };
 
 const router: any = {
@@ -64,12 +69,7 @@ const router: any = {
 describe('View submitted application page', () => {
   it('passes a query to the ApplicationDetailsComponent component', () => {
     const data = getTestQuery();
-    const r = shallow(
-      <ViewApplication
-        query={data as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={data} router={router} />);
     expect(
       r.find('Relay(ApplicationDetailsComponent)').first().prop('query')
     ).toBe(data);
@@ -80,24 +80,14 @@ describe('View submitted application page', () => {
       ...getTestQuery(),
       application: null
     };
-    const r = shallow(
-      <ViewApplication
-        query={data as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={data} router={router} />);
     expect(r).toBeEmpty();
     expect(router.push).toBeCalledWith('/404');
   });
 
   it('does not show an application decision when unreviewed', () => {
     const data = getTestQuery();
-    const r = shallow(
-      <ViewApplication
-        query={data as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={data} router={router} />);
     expect(r.find('ApplicationDecision')).toBeEmpty();
     expect(r).toMatchSnapshot();
   });
@@ -105,12 +95,7 @@ describe('View submitted application page', () => {
   it('shows approval when reviewed and approved', () => {
     const decision = 'APPROVED';
     const data = getTestQuery({applicationRevisionStatus: decision});
-    const r = shallow(
-      <ViewApplication
-        query={data as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={data} router={router} />);
     expect(r.find('ApplicationDecision').first().prop('decision')).toBe(
       decision
     );
@@ -123,12 +108,7 @@ describe('View submitted application page', () => {
   it('shows rejection when reviewed and rejected', () => {
     const decision = 'REJECTED';
     const data = getTestQuery({applicationRevisionStatus: decision});
-    const r = shallow(
-      <ViewApplication
-        query={data as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={data} router={router} />);
     expect(r.find('ApplicationDecision').first().prop('decision')).toBe(
       decision
     );
@@ -147,12 +127,7 @@ describe('View submitted application page', () => {
       applicationRevisionStatus: decision,
       comment: comments[0]
     });
-    const r = shallow(
-      <ViewApplication
-        query={data as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={data} router={router} />);
     expect(r.find('ApplicationDecision').first().prop('decision')).toBe(
       decision
     );
@@ -177,12 +152,7 @@ describe('View submitted application page', () => {
       applicationRevisionStatus: decision,
       comment: comments[0]
     });
-    const r = shallow(
-      <ViewApplication
-        query={data as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={data} router={router} />);
     expect(r.find('ApplicationDecision').first().prop('decision')).toBe(
       decision
     );
@@ -209,12 +179,7 @@ describe('View submitted application page', () => {
         }
       }
     };
-    const r = shallow(
-      <ViewApplication
-        query={query as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={query} router={router} />);
     expect(r.exists('Button')).toBe(true);
     expect(r.find('Button').text()).toBe('Resume latest draft');
     expect(r).toMatchSnapshot();
@@ -234,12 +199,7 @@ describe('View submitted application page', () => {
         }
       }
     };
-    const r = shallow(
-      <ViewApplication
-        query={query as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={query} router={router} />);
     expect(r).toMatchSnapshot();
     expect(r.exists('Button')).toBe(true);
     expect(r.find('Button').text()).toBe('View most recent submission');
@@ -259,12 +219,7 @@ describe('View submitted application page', () => {
         }
       }
     };
-    const r = shallow(
-      <ViewApplication
-        query={query as viewApplicationQueryResponse['query']}
-        router={router}
-      />
-    );
+    const r = shallow(<ViewApplication query={query} router={router} />);
     expect(r).toMatchSnapshot();
     expect(r.exists('Button')).toBe(true);
     expect(r.find('Button').text()).toBe('View most recent submission');