(v1.2.1) Improved handling of empty address