diff --git a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
index c9fe4a5..99b6e15 100644
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
@@ -99,7 +99,7 @@
           </div>
         </div>
         <!-- Karte hinzufügen, wenn Straße vorhanden ist -->
-        <div *ngIf="listing.location.latitude && listing.location.longitude" class="mt-6">
+        <div *ngIf="listing.location?.latitude && listing.location?.longitude" class="mt-6">
           <h2 class="text-xl font-semibold mb-2">Location Map</h2>
           <!-- <div style="height: 300px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers" [leafletCenter]="mapCenter" [leafletZoom]="mapZoom"></div> -->
           <div style="height: 400px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers"
@@ -213,8 +213,8 @@
                 }
                 <div class="flex justify-between">
                   <span class="font-medium">Location:</span>
-                  <span>{{ related.location.name || related.location.county }}, {{
-                    selectOptions.getState(related.location.state) }}</span>
+                  <span>{{ related.location ? (related.location.name || related.location.county) : '—' }}, {{
+                    selectOptions.getState(related.location?.state) }}</span>
                 </div>
               </div>
               <div class="mt-4">
diff --git a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
index 8348244..b4da91f 100644
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
@@ -100,7 +100,7 @@
             </div>
           </div>
           <!-- Karte hinzufügen, wenn Straße vorhanden ist -->
-          <div *ngIf="listing.location.latitude && listing.location.longitude" class="mt-6">
+          <div *ngIf="listing.location?.latitude && listing.location?.longitude" class="mt-6">
             <h2 class="text-lg font-semibold mb-2">Location Map</h2>
             <!-- <div style="height: 300px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers" [leafletCenter]="mapCenter" [leafletZoom]="mapZoom"></div> -->
             <div style="height: 400px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers"
@@ -221,8 +221,8 @@
                 </div>
                 <div class="flex justify-between">
                   <span class="font-medium">Location:</span>
-                  <span>{{ related.location.name || related.location.county }}, {{
-                    selectOptions.getState(related.location.state) }}</span>
+                  <span>{{ related.location ? (related.location.name || related.location.county) : '—' }}, {{
+                    selectOptions.getState(related.location?.state) }}</span>
                 </div>
               </div>
               <div class="mt-4">
diff --git a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
index eadf7e1..dd025dc 100644
--- a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
+++ b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
@@ -95,7 +95,7 @@
             <div class="flex justify-between">
               <span
                 class="w-fit inline-flex items-center justify-center px-2 py-1 mb-4 text-xs font-bold leading-none bg-neutral-200 text-neutral-700 rounded-full">
-                {{ selectOptions.getState(listing.location.state) }}
+                {{ selectOptions.getState(listing.location?.state) }}
               </span>
 
               @if (getListingBadge(listing); as badge) {
@@ -127,8 +127,8 @@
               }}
             </p>
             <p class="text-sm text-neutral-600 mb-2">
-              <strong>Location:</strong> {{ listing.location.name ? listing.location.name : listing.location.county ?
-              listing.location.county : this.selectOptions.getState(listing.location.state) }}
+              <strong>Location:</strong> {{ listing.location ? (listing.location.name ? listing.location.name : listing.location.county ?
+              listing.location.county : selectOptions.getState(listing.location.state)) : '—' }}
             </p>
             <p class="text-sm text-neutral-600 mb-4"><strong>Years established:</strong> {{ listing.established }}</p>
             @if(listing.imageName) {
diff --git a/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html b/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
index b6e0221..305e58a 100644
--- a/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
+++ b/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
@@ -61,7 +61,7 @@
               ><i [class]="selectOptions.getIconAndTextColorTypeOfCommercials(listing.type)" class="mr-1"></i> {{ selectOptions.getCommercialProperty(listing.type) }}</span
             >
             <div class="flex items-center justify-between my-2">
-              <span class="bg-neutral-200 text-neutral-700 text-xs font-semibold px-2 py-1 rounded">{{ selectOptions.getState(listing.location.state) }}</span>
+              <span class="bg-neutral-200 text-neutral-700 text-xs font-semibold px-2 py-1 rounded">{{ selectOptions.getState(listing.location?.state) }}</span>
               <p class="text-sm text-neutral-600 mb-4">
                 <strong>{{ getDaysListed(listing) }} days listed</strong>
               </p>
@@ -72,7 +72,7 @@
               <span class="bg-red-100 text-red-800 text-sm font-medium me-2 ml-2 px-2.5 py-0.5 rounded dark:bg-red-900 dark:text-red-300">Draft</span>
               }
             </h3>
-            <p class="text-neutral-600 mb-2">{{ listing.location.name ? listing.location.name : listing.location.county }}</p>
+            <p class="text-neutral-600 mb-2">{{ listing.location ? (listing.location.name ? listing.location.name : listing.location.county) : '—' }}</p>
             <p class="text-xl font-bold mb-4">{{ listing.price | currency : 'USD' : 'symbol' : '1.0-0' }}</p>
             <div class="flex-grow"></div>
             <button [routerLink]="['/commercial-property', listing.slug || listing.id]" class="bg-success-500 text-white px-4 py-2 rounded-full w-full hover:bg-success-600 transition duration-300 mt-auto">
diff --git a/bizmatch/src/app/pages/subscription/favorites/favorites.component.html b/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
index 276536c..3ddb4c1 100644
--- a/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
+++ b/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
@@ -21,8 +21,8 @@
             <td class="py-2 px-4">{{ $any(listing).title }}</td>
             <td class="py-2 px-4">{{ $any(listing).listingsCategory === 'commercialProperty' ? 'Commercial Property' :
               'Business' }}</td>
-            <td class="py-2 px-4">{{ listing.location.name ? listing.location.name : listing.location.county }}, {{
-              listing.location.state }}</td>
+            <td class="py-2 px-4">{{ listing.location ? (listing.location.name ? listing.location.name : listing.location.county) : '—' }}, {{
+              listing.location?.state || '' }}</td>
             <td class="py-2 px-4">${{ $any(listing).price ? $any(listing).price.toLocaleString() : 'Price on Request' }}</td>
             <td class="py-2 px-4 flex">
               @if($any(listing).listingsCategory==='business'){
@@ -74,8 +74,8 @@
         <h2 class="text-xl font-semibold mb-2">{{ $any(listing).title }}</h2>
         <p class="text-gray-600 mb-2">Category: {{ $any(listing).listingsCategory === 'commercialProperty' ? 'Commercial
           Property' : 'Business' }}</p>
-        <p class="text-gray-600 mb-2">Located in: {{ listing.location.name ? listing.location.name :
-          listing.location.county }}, {{ listing.location.state }}</p>
+        <p class="text-gray-600 mb-2">Located in: {{ listing.location ? (listing.location.name ? listing.location.name :
+          listing.location.county) : '—' }}, {{ listing.location?.state || '' }}</p>
         <p class="text-gray-600 mb-2">Price: ${{ $any(listing).price ? $any(listing).price.toLocaleString() : 'Price on Request' }}</p>
         <div class="flex justify-start">
           @if($any(listing).listingsCategory==='business'){
diff --git a/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html b/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
index 78ff638..34bfde3 100644
--- a/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
@@ -72,7 +72,7 @@
           <tr *ngFor="let listing of myListings" class="border-b">
             <td class="py-2 px-4">{{ listing.title }}</td>
             <td class="py-2 px-4">{{ listing.listingsCategory === 'commercialProperty' ? 'Commercial Property' : 'Business' }}</td>
-            <td class="py-2 px-4">{{ listing.location.name ? listing.location.name : listing.location.county ? listing.location.county : this.selectOptions.getState(listing.location.state) }}</td>
+            <td class="py-2 px-4">{{ listing.location ? (listing.location.name ? listing.location.name : listing.location.county ? listing.location.county : selectOptions.getState(listing.location.state)) : '—' }}</td>
             <td class="py-2 px-4">${{ listing.price ? listing.price.toLocaleString() : '' }}</td>
             <td class="py-2 px-4 flex justify-center">
               {{ listing.internalListingNumber ?? '—' }}