Fix issue with empty addresses