Added support for null envelope from address