Update configuration exception handling for more consistency