Modified the CLI so the Repl doesn't have to handle null