diff --git a/catalog-rest-service/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.tsx b/catalog-rest-service/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.tsx
index d55e32ea25c..1528f8d2fa6 100644
--- a/catalog-rest-service/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.tsx
@@ -70,7 +70,9 @@ const ErrorPlaceHolderES = ({ type, errorMessage }: Props) => {
       <div className="tw-flex tw-flex-col tw-items-center tw-mt-10 tw-text-base tw-font-normal">
         <p className="tw-text-lg tw-font-bold tw-mb-1 tw-text-primary">
           {`Hi, ${
-            AppState.userDetails.displayName || AppState.users[0].displayName
+            AppState.userDetails.displayName || AppState.users?.length > 0
+              ? AppState.users[0].displayName
+              : 'User'
           }!`}
         </p>
         {type === 'noData' && noRecordForES()}
diff --git a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx
index 2d1b19bfd98..2d0c06ef6a1 100644
--- a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx
@@ -61,13 +61,13 @@ const SampleDataTable: FunctionComponent<Props> = ({ sampleData }: Props) => {
                 )}
                 data-testid="row"
                 key={rowIndex}>
-                {row.map((data) => {
+                {row.map((data, index) => {
                   return (
                     <td
                       className="tableBody-cell"
                       data-testid="cell"
-                      key={data}>
-                      {data}
+                      key={index}>
+                      {data ? data.toString() : '--'}
                     </td>
                   );
                 })}