diff --git a/src/main/java/de/prob2/jupyter/CommandUtils.java b/src/main/java/de/prob2/jupyter/CommandUtils.java
index 0d341be447b6a414d4353b3ef47760c59406fbbb..4e66d06fa82027e02f9dcd466830d160a49a7fab 100644
--- a/src/main/java/de/prob2/jupyter/CommandUtils.java
+++ b/src/main/java/de/prob2/jupyter/CommandUtils.java
@@ -91,15 +91,13 @@ public final class CommandUtils {
 	
 	public static @NotNull SplitResult splitArgs(final @NotNull Parameters parameters, final @NotNull String argString) {
 		final SplitArguments splitArgs = new SplitArguments(Collections.emptyMap());
-		String remainingArgs;
+		String remainingArgs = argString;
 		if (parameters.getBodyParam().isPresent()) {
 			final String[] argsAndBody = argString.split("\n", 2);
-			remainingArgs = argsAndBody[0];
 			if (argsAndBody.length > 1) {
+				remainingArgs = argsAndBody[0];
 				splitArgs.add(parameters.getBodyParam().get(), argsAndBody[1]);
 			}
-		} else {
-			remainingArgs = argString;
 		}
 		
 		for (int i = 0; i < parameters.getPositionalParameters().size();) {