diff --git a/threads/compute-clusters.ts b/threads/compute-clusters.ts
index 6ed527d6..9a7368ce 100644
--- a/threads/compute-clusters.ts
+++ b/threads/compute-clusters.ts
@@ -68,6 +68,7 @@ export class ComputeCluster {
 			cluster = await datex(cluster);
 			if (!(cluster instanceof ComputeCluster)) throw new Error(`"${cluster}" is not a ComputeCluster`)
 		}
+		else if (!(cluster instanceof ComputeCluster)) throw new Error(`cluster must be a ComputeCluster or a DATEX identifier (e.g. "@myEndpoint.myComputCluster")`)
 
 		const ptr = Datex.Pointer.getByValue(cluster);
 		if (!ptr) throw new Error(`ComputeCluster "${cluster.name}" is not a bound to a pointer`)
diff --git a/threads/threads.ts b/threads/threads.ts
index 1ca2705e..43c326aa 100644
--- a/threads/threads.ts
+++ b/threads/threads.ts
@@ -376,6 +376,20 @@ async function getThread(): Promise<ThreadModule> {
 	
 }
 
+function removeThreadEndpoint(thread: ThreadModule) {
+	const endpoint = threadEndpoints.get(thread);
+	if (endpoint) {
+		availableThreads.set(thread, 0);
+		threadEndpoints.delete(thread);
+		if (configuration.cluster) {
+			configuration.cluster.endpoints.delete(endpoint);
+		}
+	}
+	else {
+		throw new Error("Thread is not a remote thread")
+	}
+}
+
 function freeThread(thread: ThreadModule) {
 	if (!availableThreads.has(thread)) return;
 	availableThreads.set(thread, availableThreads.get(thread)! - 1); 
@@ -668,6 +682,11 @@ export async function run<ReturnType>(task: (() => ReturnType)|JSTransferableFun
 			const variableName = e.message.match(/ReferenceError - (\S*)/)![1];
 			throw new RuntimeError("Variable '"+variableName+"' from the parent scope must be explicitly declared at the beginning of the function body with 'use ("+variableName+")'.")
 		}
+		else if (e instanceof Error && e.message.endsWith("is offline")) {
+			console.log("cluster endpoint " + endpoint + " is offline");
+			removeThreadEndpoint(thread);
+			return run(task, options, _meta);
+		}
 		else if (e instanceof Error) {
 			throw new Error(e.message);
 		}