Added config error handling