Fix calls to properties.contains() that should be properties.containsKey()
Fix a typo in an error message
Fix CommandLine to Properties conversion