Config and Error handling changes