Fix config
better error messages