diff --git a/Logic/FeatureSource/Actors/TileLocalStorage.ts b/Logic/FeatureSource/Actors/TileLocalStorage.ts
index 22e7dbb031..897c2e8520 100644
--- a/Logic/FeatureSource/Actors/TileLocalStorage.ts
+++ b/Logic/FeatureSource/Actors/TileLocalStorage.ts
@@ -14,6 +14,7 @@ export default class TileLocalStorage<T> {
     private readonly inUse = new UIEventSource(false)
     private readonly cachedSources: Record<number, UIEventSource<T> & { flush: () => void }> = {}
 
+    private static readonly useIndexedDb = typeof indexedDB !== "undefined"
     private constructor(layername: string) {
         this._layername = layername
     }
@@ -49,6 +50,9 @@ export default class TileLocalStorage<T> {
     }
 
     private async SetIdb(tileIndex: number, data: any): Promise<void> {
+        if(!TileLocalStorage.useIndexedDb){
+            return
+        }
         try {
             await this.inUse.AsPromise((inUse) => !inUse)
             this.inUse.setData(true)
@@ -69,6 +73,9 @@ export default class TileLocalStorage<T> {
     }
 
     private GetIdb(tileIndex: number): Promise<any> {
+        if(!TileLocalStorage.useIndexedDb){
+            return undefined
+        }
         return IdbLocalStorage.GetDirectly(this._layername + "_" + tileIndex)
     }
 }
diff --git a/Logic/FeatureSource/PerLayerFeatureSourceSplitter.ts b/Logic/FeatureSource/PerLayerFeatureSourceSplitter.ts
index 38b64748b4..4e782b5e1a 100644
--- a/Logic/FeatureSource/PerLayerFeatureSourceSplitter.ts
+++ b/Logic/FeatureSource/PerLayerFeatureSourceSplitter.ts
@@ -1,8 +1,8 @@
-import { FeatureSource, IndexedFeatureSource } from "./FeatureSource"
+import {FeatureSource} from "./FeatureSource"
 import FilteredLayer from "../../Models/FilteredLayer"
 import SimpleFeatureSource from "./Sources/SimpleFeatureSource"
-import { Feature } from "geojson"
-import { UIEventSource } from "../UIEventSource"
+import {Feature} from "geojson"
+import {UIEventSource} from "../UIEventSource"
 
 /**
  * In some rare cases, some elements are shown on multiple layers (when 'passthrough' is enabled)
@@ -59,6 +59,10 @@ export default class PerLayerFeatureSourceSplitter<T extends FeatureSource = Fea
                 let foundALayer = false
                 for (let i = 0; i < layers.length; i++) {
                     const layer = layers[i]
+                    if(!layer.layerDef?.source){
+                        console.error("PerLayerFeatureSourceSplitter got a layer without a source:", layer.layerDef.id)
+                        continue
+                    }
                     if (layer.layerDef.source.osmTags.matchesProperties(f.properties)) {
                         const id = f.properties.id
                         // We have found our matching layer!
diff --git a/Logic/FeatureSource/Sources/LastClickFeatureSource.ts b/Logic/FeatureSource/Sources/LastClickFeatureSource.ts
index 596a994ade..796ba3722d 100644
--- a/Logic/FeatureSource/Sources/LastClickFeatureSource.ts
+++ b/Logic/FeatureSource/Sources/LastClickFeatureSource.ts
@@ -32,7 +32,7 @@ export class LastClickFeatureSource implements WritableFeatureSource {
             }
 
         const renderings = Utils.Dedup(
-            allPresets.map((uiElem) => uiElem.ConstructElement().innerHTML)
+            allPresets.map((uiElem) => Utils.runningFromConsole ? "" : uiElem.ConstructElement().innerHTML)
         )
 
         const properties = {