Adjusted CLI input so CLI gives more informative feedback