diff --git a/src/components/atoms/delete-job/delete-job.atom.jsx b/src/components/atoms/delete-job/delete-job.atom.jsx
index 9648b41..e410b60 100644
--- a/src/components/atoms/delete-job/delete-job.atom.jsx
+++ b/src/components/atoms/delete-job/delete-job.atom.jsx
@@ -25,6 +25,8 @@ export function DeleteJobAtom({ setSelectedJobId, jobId }) {
     });
     const result = await deleteJob({
       variables: { jobId: jobId },
+      refetchQueries: ["QUERY_ALL_JOBS_PAGINATED"],
+      awaitRefetchQueries: true,
     });
 
     if (result.errors) {
diff --git a/src/components/atoms/jobs-parts-graph/jobs-parts-graph.atom.jsx b/src/components/atoms/jobs-parts-graph/jobs-parts-graph.atom.jsx
index 3085905..f4ad1b3 100644
--- a/src/components/atoms/jobs-parts-graph/jobs-parts-graph.atom.jsx
+++ b/src/components/atoms/jobs-parts-graph/jobs-parts-graph.atom.jsx
@@ -37,7 +37,13 @@ export default function JobPartsGraphAtom({
   }, [job, price]);
 
   if (loading) return <Skeleton active />;
-  if (!job) return <ErrorResultAtom title="Error displaying job data." />;
+  if (!job)
+    return (
+      <ErrorResultAtom
+        title="Error displaying parts graphs."
+        errorMessage="It looks like this job doesn't exist."
+      />
+    );
 
   return (
     <div
diff --git a/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx b/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx
index b8a25ed..c250c9e 100644
--- a/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx
+++ b/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx
@@ -10,7 +10,13 @@ import DeleteJobAtom from "../../atoms/delete-job/delete-job.atom";
 export default function JobsDetailDescriptionMolecule({ loading, job }) {
   if (loading) return <Skeleton active />;
 
-  if (!job) return <ErrorResultAtom title="Error displaying job data." />;
+  if (!job)
+    return (
+      <ErrorResultAtom
+        title="Error displaying job header data."
+        errorMessage="It looks like this job doesn't exist."
+      />
+    );
 
   return (
     <div>
diff --git a/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx b/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx
index 6aabfe4..ef26d9a 100644
--- a/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx
+++ b/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx
@@ -4,6 +4,7 @@ import React, { useState } from "react";
 import ipcTypes from "../../../ipc.types";
 import { alphaSort } from "../../../util/sorters";
 import CurrencyFormatterAtom from "../../atoms/currency-formatter/currency-formatter.atom";
+import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
 import IgnoreJobLine from "../../atoms/ignore-job-line/ignore-job-line.atom";
 import partTypeConverterAtom from "../../atoms/part-type-converter/part-type-converter.atom";
 import PriceDiffPcFormatterAtom from "../../atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom";
@@ -13,6 +14,14 @@ export default function JobLinesTableMolecule({ loading, job }) {
   const [searchText, setSearchText] = useState("");
   const [filters, setFilters] = useState({ ignore: ["false"] });
 
+  if (!job) {
+    return (
+      <ErrorResultAtom
+        title="Error Displaying Job Lines"
+        errorMessage="It looks like this job doesn't exist."
+      />
+    );
+  }
   const { joblines } = job;
   const columns = [
     {
diff --git a/src/components/molecules/jobs-targets-stats/jobs-targets-stats.molecule.jsx b/src/components/molecules/jobs-targets-stats/jobs-targets-stats.molecule.jsx
index 1db0ff3..08e92bb 100644
--- a/src/components/molecules/jobs-targets-stats/jobs-targets-stats.molecule.jsx
+++ b/src/components/molecules/jobs-targets-stats/jobs-targets-stats.molecule.jsx
@@ -5,7 +5,7 @@ import { createStructuredSelector } from "reselect";
 import { selectSelectedJobTargetPc } from "../../../redux/application/application.selectors";
 import {
   CalculateJobRpsDollars,
-  CalculateJobRpsPc
+  CalculateJobRpsPc,
 } from "../../../util/CalculateJobRps";
 import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
 
@@ -38,7 +38,13 @@ export function JobsTargetsStatsMolecule({
   );
 
   if (loading) return <Skeleton active />;
-  if (!job) return <ErrorResultAtom title="Error displaying job data." />;
+  if (!job)
+    return (
+      <ErrorResultAtom
+        title="Error displaying job totals."
+        errorMessage="It looks like this job doesn't exist."
+      />
+    );
   return (
     <div
       style={{
diff --git a/src/components/organisms/jobs-detail/jobs-detail.organism.jsx b/src/components/organisms/jobs-detail/jobs-detail.organism.jsx
index d24b598..4c67bc6 100644
--- a/src/components/organisms/jobs-detail/jobs-detail.organism.jsx
+++ b/src/components/organisms/jobs-detail/jobs-detail.organism.jsx
@@ -29,10 +29,10 @@ export function JobsDetailOrganism({ selectedJobId, setSelectedJobTargetPc }) {
   });
 
   useEffect(() => {
-    if (data)
+    if (data && data.jobs_by_pk)
       setSelectedJobTargetPc({
-        group: data.jobs_by_pk.group,
-        v_age: data.jobs_by_pk.v_age,
+        group: data.jobs_by_pk && data.jobs_by_pk.group,
+        v_age: data.jobs_by_pk && data.jobs_by_pk.v_age,
       });
   }, [data, setSelectedJobTargetPc]);