Merge from upstream
No more empty catch block if there's an issue loading the config