Fixed more bugs related to empty addresses.