diff --git a/src/Components/ImagesTable/ImagesTable.tsx b/src/Components/ImagesTable/ImagesTable.tsx
index e203ab25..32782d3a 100644
--- a/src/Components/ImagesTable/ImagesTable.tsx
+++ b/src/Components/ImagesTable/ImagesTable.tsx
@@ -331,7 +331,7 @@ const ImagesTableRow = ({ compose, rowIndex }: ImagesTableRowPropTypes) => {
     }
   }, [setPollingInterval, composeStatus]);
 
-  const type = compose.request?.image_requests[0]?.upload_request?.type;
+  const type = compose.request.image_requests[0]?.upload_request?.type;
 
   switch (type as string) {
     case 'aws':
diff --git a/src/Components/ImagesTable/ImagesTableToolbar.tsx b/src/Components/ImagesTable/ImagesTableToolbar.tsx
index ad53e5c6..7899e947 100644
--- a/src/Components/ImagesTable/ImagesTableToolbar.tsx
+++ b/src/Components/ImagesTable/ImagesTableToolbar.tsx
@@ -130,7 +130,7 @@ const ImagesTableToolbar: React.FC<imagesTableToolbarProps> = ({
 
   const { trigger: fixupBlueprint } = useFixupBlueprintMutation();
   const hasErrors =
-    blueprintDetails?.lint?.errors && blueprintDetails?.lint?.errors.length > 0;
+    blueprintDetails?.lint.errors && blueprintDetails.lint.errors.length > 0;
   const [isLintExp, setIsLintExp] = React.useState(true);
   const onToggleLintExp = (_event: React.MouseEvent, isExpanded: boolean) => {
     setIsLintExp(isExpanded);
@@ -184,7 +184,7 @@ const ImagesTableToolbar: React.FC<imagesTableToolbarProps> = ({
               isExpanded={isLintExp}
             >
               <List isPlain>
-                {blueprintDetails?.lint?.errors?.map((err) => (
+                {blueprintDetails.lint.errors.map((err) => (
                   <ListItem key={err.description}>
                     {err.name}: {err.description}
                   </ListItem>
diff --git a/src/Components/ImagesTable/Instance.tsx b/src/Components/ImagesTable/Instance.tsx
index 7fd80681..5d11cfdf 100644
--- a/src/Components/ImagesTable/Instance.tsx
+++ b/src/Components/ImagesTable/Instance.tsx
@@ -461,7 +461,7 @@ export const LocalInstance = ({ compose }: LocalInstancePropTypes) => {
     return <></>;
   }
 
-  const parsedPath = path.parse(options?.artifact_path);
+  const parsedPath = path.parse(options.artifact_path);
   const href = '/files#/?path=' + encodeURIComponent(parsedPath.dir);
   return (
     <Button