diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoSuchStepException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoSuchStepException.java
new file mode 100644
index 000000000..7b8871fd0
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoSuchStepException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2006-2007 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.step;
+
+/**
+ * Exception to signal that a step was requested that is unknown or does not
+ * exist.
+ * 
+ * @author Dave Syer
+ * 
+ */
+public class NoSuchStepException extends RuntimeException {
+
+	/**
+	 * Create a new exception instance with the message provided.
+	 * @param message
+	 */
+	public NoSuchStepException(String message) {
+		super(message);
+	}
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java
index b977e2286..7328cc84b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java
@@ -14,6 +14,6 @@ public interface StepLocator {
 	
 	Collection<String> getStepNames();
 	
-	Step getStep(String stepName);
+	Step getStep(String stepName) throws NoSuchStepException;
 
 }
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/NoSuchStepExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NoSuchStepExceptionTests.java
new file mode 100644
index 000000000..b708eb62d
--- /dev/null
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NoSuchStepExceptionTests.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2006-2007 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.step;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+
+public class NoSuchStepExceptionTests {
+
+	@Test
+	public void testNoSuchStepExecutionExceptionString() {
+		NoSuchStepException exception = new NoSuchStepException("foo");
+		assertEquals("foo", exception.getMessage());
+	}
+
+}