diff --git a/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java b/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java
index 5856ecd..35bf1b4 100644
--- a/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java
+++ b/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java
@@ -49,6 +49,11 @@ public class TrainIterationConverter implements Converter<TrainIteration> {
 	public TrainIteration convertFromText(String value, Class<?> targetType, String optionContext) {
 
 		String[] parts = value.split(" ");
+
+		if (parts.length != 2) {
+			throw new IllegalArgumentException(String.format("Cannot resolve TrainIteration from '%s'", value));
+		}
+
 		Train train = ReleaseTrains.getTrainByName(parts[0].trim());
 		Iteration iteration = train.getIteration(parts[1].trim());
 
diff --git a/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java b/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java
index ea497da..1997637 100644
--- a/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java
@@ -54,8 +54,8 @@ public class ReleaseCommandsIntegrationTests extends AbstractIntegrationTests {
 	@Test
 	public void predictsReleaseTrainCorrectly() throws Exception {
 
-		git.update(ReleaseTrains.GOSLING);
+		git.update(ReleaseTrains.MOORE);
 
-		assertThat(releaseCommands.predictTrainAndIteration(), is("Gosling"));
+		assertThat(releaseCommands.predictTrainAndIteration(), is("Moore"));
 	}
 }