(PE-2415) fix error handling on bad CLI args