Merge "Update exception type thrown when NetworkStack is missing"