Merge pull request #3085 from rubenk/handle_simple_config_errors