Minor changes
Return null or error on missing configs
Better error handling.