Skip if address part is empty.

It seems my previous change is not based on the 1.5.0 version. I am sorry for creating confusing merge requests. Please close as appropriate or let me know how I can further help.. thank you.