diff --git a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.html b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.html
index 02d25281da..cf49ab5e60 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.html
+++ b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.html
@@ -27,8 +27,15 @@
       <div class="row row-align">
         <div class="col-md-4 detail-label">GST Number</div>
         <div class="col-md-8">
-          {{ selectedSupplier?.supplierGstNumber?.part1 }} -RT-
-          {{ selectedSupplier?.supplierGstNumber?.part2 }}
+          <ng-container
+            *ngIf="
+              selectedSupplier?.supplierGstNumber?.part1 && selectedSupplier?.supplierGstNumber?.part2;
+              else emptyGST
+            "
+          >
+            {{ selectedSupplier?.supplierGstNumber?.part1 }} -RT- {{ selectedSupplier?.supplierGstNumber?.part2 }}
+          </ng-container>
+          <ng-template #emptyGST></ng-template>
         </div>
       </div>
 
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.ts b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.ts
index d83e06d804..06a81faa8d 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.ts
+++ b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-detail/supplier-detail.component.ts
@@ -44,7 +44,7 @@ import { MatAutocompleteTrigger, MatAutocomplete } from '@angular/material/autoc
 import { MatInput } from '@angular/material/input';
 import { MatFormField, MatLabel, MatError } from '@angular/material/form-field';
 import { MatButton } from '@angular/material/button';
-import { AsyncPipe, UpperCasePipe, DatePipe } from '@angular/common';
+import { AsyncPipe, UpperCasePipe, DatePipe, CommonModule } from '@angular/common';
 import { MatCard, MatCardContent } from '@angular/material/card';
 
 @Component({
@@ -53,6 +53,7 @@ import { MatCard, MatCardContent } from '@angular/material/card';
   styleUrls: ['./supplier-detail.component.scss'],
   standalone: true,
   imports: [
+    CommonModule,
     MatCard,
     MatCardContent,
     MatButton,
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-management.service.ts b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-management.service.ts
index 321b14e872..68f1f7aa88 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-management.service.ts
+++ b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/supplier-management.service.ts
@@ -11,10 +11,13 @@ export class SupplierManagementService {
   constructor(private locationServices: LocationsService) {}
 
   convertSupplierGSTNumberToFormModel(gstNumber: string): GstNumberModel {
+    if (!gstNumber) {
+      return { part1: '', part2: '' };
+    }
     const gstArray: string[] = gstNumber.split('-RT-', 2);
     const convertedGstNumber: GstNumberModel = {
-      part1: gstArray[0],
-      part2: gstArray[1]
+      part1: gstArray[0] || '',
+      part2: gstArray[1] || ''
     };
 
     return convertedGstNumber;
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/supplier-list-data.service.ts b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/supplier-list-data.service.ts
index e1e111e2f7..3ac021d4be 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/supplier-list-data.service.ts
+++ b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/supplier-list-data.service.ts
@@ -131,8 +131,10 @@ export class SupplierListDataService {
           resolve();
         },
         error: (error) => {
+          console.error('Error in getSupplierById:', error);
           this.alertService.clearAlert();
           this.alertService.setAlert('danger', globalConst.getSupportByIdError);
+          reject(error);
         }
       });
     });
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/suppliers-list.component.ts b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/suppliers-list.component.ts
index 4c40869209..8df6b6ca91 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/suppliers-list.component.ts
+++ b/responders/src/UI/embc-responder/src/app/feature-components/supplier-management/suppliers-list/suppliers-list.component.ts
@@ -95,6 +95,9 @@ export class SuppliersListComponent implements OnInit {
     this.isLoading = true;
     this.supplierListDataService.getSupplierDetails($event.id, 'supplier').then(() => {
       this.isLoading = false;
+    })
+    .catch(() => {
+      this.isLoading = false;
     });
   }
 
@@ -102,6 +105,9 @@ export class SuppliersListComponent implements OnInit {
     this.isLoading = true;
     this.supplierListDataService.getSupplierDetails($event.id, 'mutualAid').then(() => {
       this.isLoading = false;
+    })
+    .catch(() => {
+      this.isLoading = false;
     });
   }