diff --git a/src/Logic/ImageProviders/ImageUploadManager.ts b/src/Logic/ImageProviders/ImageUploadManager.ts
index 49c878bcbc..aced3e88be 100644
--- a/src/Logic/ImageProviders/ImageUploadManager.ts
+++ b/src/Logic/ImageProviders/ImageUploadManager.ts
@@ -170,6 +170,9 @@ export class ImageUploadManager {
         }
         if (location === undefined || location?.some((l) => l === undefined)) {
             feature ??= this._indexedFeatures.featuresById.data.get(featureId)
+            if(feature === undefined){
+                throw "ImageUploadManager: no feature given and no feature found in the indexedFeature. Cannot upload this image"
+            }
             location = GeoOperations.centerpointCoordinates(feature)
         }
         try {