Return invalid options as strings
Merge pull request #2312 from alco/option-parser-fixes

Return invalid options as strings