diff --git a/src/api/DataTypes.js b/src/api/DataTypes.js
index 9cea6592b5a7abe55c6ca41a2ba258cefca3f65b..a193067560eb12527d4b137c9c1a6b941f31f4e2 100644
--- a/src/api/DataTypes.js
+++ b/src/api/DataTypes.js
@@ -53,7 +53,7 @@ export class AWXJobDetails {
 
   message() {
     const stem = `The ${this.typeLabel()} `;
-    const info = jobMessages[this.job?.status.toLowerCase()];
+    const info = jobMessages[this.job ? this.job.status.toLowerCase() : "new"];
     const message = stem + info;
     return message;
   }
diff --git a/src/views/jobs/JobDetailsContainer.js b/src/views/jobs/JobDetailsContainer.js
index 3d9bce946492e23ea38fb46d6ac6d59989c20e64..acafce27aae398bc54e3552e7dbd5d2538d9d3f2 100644
--- a/src/views/jobs/JobDetailsContainer.js
+++ b/src/views/jobs/JobDetailsContainer.js
@@ -3,7 +3,6 @@ import { JobDetailsView } from "./JobDetailsView";
 import { LinearProgress } from "@material-ui/core";
 import { useOperation, useJobById } from "../../api/SwaggerApi";
 import { useSafePolling } from "../../hooks/Polling";
-import { AWXJobDetails } from "../../api/DataTypes";
 import NotFound from "../../components/navigation/NotFound";
 import { onFetchEntityError } from "../../components/common/Helper";
 
@@ -18,8 +17,7 @@ export function JobDetailsContainer({ id }) {
   const [job, getJobById, , /* reset*/ jobLoading] = useJobById();
   const firstTime = useRef(true);
 
-  const awxJob = new AWXJobDetails(job);
-  const jobFinished = awxJob.isFinished();
+  const jobFinished = job?.finished;
 
   const getOperationUntilFinished = useCallback(() => {
     if (!jobFinished) {
diff --git a/src/views/jobs/JobListView.js b/src/views/jobs/JobListView.js
index a0ad1460969e424191289a55f6d82a09ac065c71..5cfdb5f4ed859acda31d1535da09fb243a36a10a 100644
--- a/src/views/jobs/JobListView.js
+++ b/src/views/jobs/JobListView.js
@@ -54,8 +54,6 @@ export function JobListView() {
   const [deploymentStatus, setDeploymentStatus] = useState(null);
   const [jobList, setJobList] = useState([]);
 
-  console.log("JobListView:", operations, jobList);
-
   const handleTabChange = (event, tab) => {
     setState((s) =>
       serialize(s.tab) === serialize(tab)