Make sure defaultServerName is initialised even on errors
1 file changed