diff --git a/packages/cli/src/active-executions.ts b/packages/cli/src/active-executions.ts
index 7025a477c6..aed55c9c84 100644
--- a/packages/cli/src/active-executions.ts
+++ b/packages/cli/src/active-executions.ts
@@ -127,20 +127,14 @@ export class ActiveExecutions {
 	 */
 
 	attachWorkflowExecution(executionId: string, workflowExecution: PCancelable<IRun>) {
-		const execution = this.getExecution(executionId);
-		if (execution) {
-			execution.workflowExecution = workflowExecution;
-		}
+		this.getExecution(executionId).workflowExecution = workflowExecution;
 	}
 
 	attachResponsePromise(
 		executionId: string,
 		responsePromise: IDeferredPromise<IExecuteResponsePromiseData>,
 	): void {
-		const execution = this.getExecution(executionId);
-		if (execution) {
-			execution.responsePromise = responsePromise;
-		}
+		this.getExecution(executionId).responsePromise = responsePromise;
 	}
 
 	resolveResponsePromise(executionId: string, response: IExecuteResponsePromiseData): void {
@@ -151,31 +145,23 @@ export class ActiveExecutions {
 	/** Cancel the execution promise and reject its post-execution promise. */
 	stopExecution(executionId: string): void {
 		const execution = this.getExecution(executionId);
-		if (execution) {
-			execution.workflowExecution?.cancel();
-			execution.postExecutePromise.reject(new ExecutionCancelledError(executionId));
-			this.logger.debug('Execution cancelled', { executionId });
-		}
+		execution.workflowExecution?.cancel();
+		execution.postExecutePromise.reject(new ExecutionCancelledError(executionId));
+		this.logger.debug('Execution cancelled', { executionId });
 	}
 
 	/** Resolve the post-execution promise in an execution. */
 	finalizeExecution(executionId: string, fullRunData?: IRun) {
 		const execution = this.getExecution(executionId);
-		if (execution) {
-			execution.postExecutePromise.resolve(fullRunData);
-			this.logger.debug('Execution finalized', { executionId });
-		}
+		execution.postExecutePromise.resolve(fullRunData);
+		this.logger.debug('Execution finalized', { executionId });
 	}
 
 	/**
 	 * Returns a promise which will resolve with the data of the execution with the given id
 	 */
 	async getPostExecutePromise(executionId: string): Promise<IRun | undefined> {
-		const execution = this.getExecution(executionId);
-		if (execution) {
-			return await execution.postExecutePromise.promise;
-		}
-		return undefined;
+		return await this.getExecution(executionId).postExecutePromise.promise;
 	}
 
 	/**
@@ -202,14 +188,11 @@ export class ActiveExecutions {
 	}
 
 	setStatus(executionId: string, status: ExecutionStatus) {
-		const execution = this.getExecution(executionId);
-		if (execution) {
-			execution.status = status;
-		}
+		this.getExecution(executionId).status = status;
 	}
 
-	getStatus(executionId: string): ExecutionStatus | undefined {
-		return this.getExecution(executionId)?.status;
+	getStatus(executionId: string): ExecutionStatus {
+		return this.getExecution(executionId).status;
 	}
 
 	/** Wait for all active executions to finish */
@@ -241,7 +224,7 @@ export class ActiveExecutions {
 		}
 	}
 
-	private getExecution(executionId: string): IExecutingWorkflowData | undefined {
+	private getExecution(executionId: string): IExecutingWorkflowData {
 		const execution = this.activeExecutions[executionId];
 		if (!execution) {
 			ErrorReporterProxy.error(new ExecutionNotFoundError(executionId));
diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts
index 602304ff63..a4dd344b62 100644
--- a/packages/cli/src/workflow-runner.ts
+++ b/packages/cli/src/workflow-runner.ts
@@ -334,10 +334,7 @@ export class WorkflowRunner {
 					if (workflowExecution.isCanceled) {
 						fullRunData.finished = false;
 					}
-					const status = this.activeExecutions.getStatus(executionId);
-					if (status) {
-						fullRunData.status = status;
-					}
+					fullRunData.status = this.activeExecutions.getStatus(executionId);
 					this.activeExecutions.finalizeExecution(executionId, fullRunData);
 				})
 				.catch(