Issue 114. Remove InvalidConfigurationException