Improve Configuration Validation (#577)

* improve configuration validation
2 files changed