diff --git a/dist/index.js b/dist/index.js
index 188c2299..7ca0151c 100644
Binary files a/dist/index.js and b/dist/index.js differ
diff --git a/dist/index.js.map b/dist/index.js.map
index 4d513f7a..87adb3a2 100644
Binary files a/dist/index.js.map and b/dist/index.js.map differ
diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts b/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts
index f7cd436a..871ae1bc 100644
--- a/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts
+++ b/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts
@@ -113,6 +113,17 @@ status: {}
         true,
       );
 
+      // if status of pod is not running, then continue
+      const podStatus = await CloudRunnerSystem.Run(
+        `kubectl get pods -n ${namespace} ${podname} -o jsonpath='{.status.phase}'`,
+        false,
+        true,
+      );
+      if (podStatus !== 'Running') {
+        CloudRunnerLogger.log(`Pod status: ${podStatus}`);
+        continue;
+      }
+
       const logs = await CloudRunnerSystem.Run(`kubectl logs ${podname} -f --timestamps`, false, true);
       CloudRunnerLogger.log(`Logs: ${logs}`);
 
diff --git a/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts b/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts
index 37f72b3e..d51c26ce 100644
--- a/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts
+++ b/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts
@@ -44,8 +44,9 @@ describe('Cloud Runner Kubernetes', () => {
       const kubeConfig = new k8s.KubeConfig();
       kubeConfig.loadFromDefault();
       const kubeClient = kubeConfig.makeApiClient(k8s.CoreV1Api);
+      const kubeClientApps = kubeConfig.makeApiClient(k8s.AppsV1Api);
 
-      await KubernetesLogService.createLogService('test', 'default', kubeClient);
+      await KubernetesLogService.createLogDeployment('test', kubeClientApps, kubeClient);
 
       CloudRunnerLogger.log(`run 1 succeeded`);
     }, 1_000_000_000);