Fixes
Test crash fixed
Handle the case when config file doesn't exist