diff --git a/payment/uc_paypal/uc_paypal.module b/payment/uc_paypal/uc_paypal.module
index 6756535..ae8f841 100644
--- a/payment/uc_paypal/uc_paypal.module
+++ b/payment/uc_paypal/uc_paypal.module
@@ -460,12 +460,6 @@ function uc_paypal_wpp_charge($order_id, $amount, $data) {
// fall through
case 'Failure':
$message = t('@type failed.', array('@type' => $types[$data['txn_type']])) . _uc_paypal_build_error_messages($nvp_response);
- if ($data['txn_type'] != UC_CREDIT_PRIOR_AUTH_CAPTURE) {
- $message .= '
'. t('Address: @avscode', array('@avscode' => _uc_paypal_avscode_message($nvp_response['AVSCODE'])));
- if (variable_get('uc_credit_cvv_enabled', TRUE)) {
- $message .= '
'. t('CVV2: @cvvmatch', array('@cvvmatch' => _uc_paypal_cvvmatch_message($nvp_response['CVV2MATCH'])));
- }
- }
$result = array(
'success' => FALSE,
'message' => $message,
@@ -1163,7 +1157,6 @@ function _uc_paypal_avscode_message($code) {
return t('The merchant did not provide AVS information. Not processed.');
case '4':
return t('Address not checked, or acquirer had no response. Service not available.');
- case 'Null':
default:
return t('No AVS response was obtained.');
}
@@ -1197,6 +1190,8 @@ function _uc_paypal_avscode_message($code) {
return t('Service not supported');
case 'U':
return t('Unavailable');
+ case 'Null':
+ return t('No AVS response was obtained.');
default:
return t('An unknown error occurred.');
}