fixes for null address (eg mwi service not activated)