Strengthening the assertions around the error handling of single address requests