move the invalid resopnse check to the end

mediocre · Jun 1, 2023 · 00c258d · 00c258d
1 parent 3bcf7f8
commit 00c258d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/carriers/usps.js b/carriers/usps.js
@@ -90,12 +90,12 @@ function USPS(options) {
 
                 if (err) {
                     return callback(err);
-                } else if (!data || (!data.Error && !data.TrackResponse)) {
+                } else if (!data) {
                     return callback(new Error('Invalid or missing TrackResponse'));
                 } else if (data.Error) {
                     // Invalid credentials or Invalid Tracking Number
                     return callback(new Error(data.Error.Description[0]));
-                } else if (data.TrackResponse.TrackInfo[0].Error) {
+                } else if (!data?.TrackResponse?.TrackInfo?.[0] || data.TrackResponse.TrackInfo[0].Error) {
                     // No Tracking Information
                     return callback(null, results);
                 }