diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
index fbc9a25b0..3d3dbba5d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2018 the original author or authors.
+ * Copyright 2006-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -442,16 +442,17 @@ public class CommandLineJobRunner {
 	}
 
 	private List<JobExecution> getRunningJobExecutions(String jobIdentifier) {
-		List<JobExecution> jobExecutions = getJobExecutionsWithStatusGreaterThan(jobIdentifier, BatchStatus.COMPLETED);
-		if (jobExecutions.isEmpty()) {
-			return null;
-		}
+		Long executionId = getLongIdentifier(jobIdentifier);
 		List<JobExecution> result = new ArrayList<>();
-		for (JobExecution jobExecution : jobExecutions) {
-			if (jobExecution.isRunning()) {
+		if (executionId != null) {
+			JobExecution jobExecution = jobExplorer.getJobExecution(executionId);
+			if (jobExecution != null && jobExecution.isRunning()) {
 				result.add(jobExecution);
 			}
 		}
+		else {
+			result.addAll(jobExplorer.findRunningJobExecutions(jobIdentifier));
+		}
 		return result.isEmpty() ? null : result;
 	}
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
index f50b7191d..49b88ea03 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2013 the original author or authors.
+ * Copyright 2006-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
@@ -52,6 +53,7 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Lucas Ward
+ * @author Mahmoud Ben Hassine
  *
  */
 public class CommandLineJobRunnerTests {
@@ -242,7 +244,7 @@ public class CommandLineJobRunnerTests {
 		String[] args = new String[] { jobPath, "-stop", jobName };
 		StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(3L, jobName));
 		CommandLineJobRunner.main(args);
-		assertEquals(0, StubSystemExiter.status);
+		assertEquals(1, StubSystemExiter.status);
 	}
 
 	@Test
@@ -258,7 +260,7 @@ public class CommandLineJobRunnerTests {
 		String[] args = new String[] { jobPath, "-stop", jobName };
 		StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(5L, jobName));
 		CommandLineJobRunner.main(args);
-		assertEquals(0, StubSystemExiter.status);
+		assertEquals(1, StubSystemExiter.status);
 	}
 
 	@Test
@@ -267,7 +269,7 @@ public class CommandLineJobRunnerTests {
 		JobInstance jobInstance = new JobInstance(3L, jobName);
 		StubJobExplorer.jobInstances = Arrays.asList(jobInstance);
 		CommandLineJobRunner.main(args);
-		assertEquals(0, StubSystemExiter.status);
+		assertEquals(1, StubSystemExiter.status);
 	}
 
 	@Test
@@ -455,7 +457,7 @@ public class CommandLineJobRunnerTests {
 
 		@Override
 		public Set<JobExecution> findRunningJobExecutions(String jobName) {
-			throw new UnsupportedOperationException();
+			return new HashSet<>();
 		}
 
 		@Override