Config file exceptions and clean up