Now handles undefined addresses