Atlas Global Group, L.P. (“Atlas”) appeals from the district court’s grant of Grupo Dataflux’s (“Dataflux”) motion to dismiss for lack of subject matter jurisdiction. For the reasons stated herein, we REVERSE and REMAND for the entry of judgment in favor of Atlas.
FACTUAL AND PROCEDURAL HISTORY
Atlas is a limited partnership created under Texas law. Dataflux is a Mexican corporation. On November 18, 1997, Atlas *170brought suit in the Southern District of Texas against Dataflux alleging breach of contract and quantum meruit. Jurisdiction was predicated solely upon the grounds of diversity pursuant to 28 U.S.C. § 1332(a) (1993). At the time the complaint was filed, Atlas’s partnership was comprised of five members: (1) Bahia Management, L.L.C., a Texas limited liability company; (2) Capital Financial Partner, Inc., a Delaware corporation; (3) HIL Financial Holdings, L.P., a Texas limited partnership; (4) Francisco Llamosa, a Mexican citizen; and (5) Oscar Robles-Canon, a Mexican citizen. Shortly before trial, however, Atlas completed a business transaction which removed the two Mexican citizens as partners. After a six-day jury trial, the jury awarded $750,000 in damages to Atlas, finding that Dataflux breached its contract with Atlas. Subsequently, Dataflux moved to dismiss, arguing that the district court lacked subject matter jurisdiction because at the time the complaint was filed, two of Atlas’s partners, like Dataflux, were Mexican citizens. The motion was granted. Atlas filed a motion to alter or amend the judgment, which was denied. Atlas appealed.
STANDARD OF REVIEW
We review dismissals for lack of subject matter jurisdiction de novo. Whatley v. Resolution Trust Corp., 32 F.3d 905, 907 (5th Cir.1994).
DISCUSSION
The parties do not challenge the rule that, for purposes of determining diversity jurisdiction, a partnership is a citizen of each jurisdiction in which its individual partners are citizens. See Carden v. Arkoma Assocs., 494 U.S. 185, 195, 110 S.Ct. 1015, 108 L.Ed.2d 157 (1990) (‘We adhere to our oft-repeated rule that diversity jurisdiction in a suit by or against the entity depends on the citizenship of ‘all the members.’ ”). Likewise, the parties do not dispute that there was complete diversity when the trial of this matter commenced. Instead, Dataflux asserts that because the parties were not diverse at the time the complaint was filed, the case was properly dismissed for lack of subject matter jurisdiction. Atlas counters that this initial lack of diversity is not determinative. It maintains that the lack of diversity was remedied prior to trial and, therefore, the district court had jurisdiction.
“The existence of federal jurisdiction ordinarily depends on the facts as they exist when the complaint is filed.” Newman-Green, Inc. v. Alfonzo-Larrain, 490 U.S. 826, 830, 109 S.Ct. 2218, 104 L.Ed.2d 893 (1989). However, the Supreme Court has recognized that, as with most general principles, there are exceptions. Id. In Caterpillar, Inc. v. Lewis, 519 U.S. 61, 117 S.Ct. 467, 136 L.Ed.2d 437 (1996), and Newman-Green, the Supreme Court carved out two such exceptions. Both of these cases are heavily relied upon by Atlas.
A. Newman-Green
In Newman-Green, the question presented was whether the court of appeals had the authority, pursuant to Federal Rule of Civil Procedure 21, to dismiss a dispensable non-diverse party whose presence spoiled statutory diversity jurisdiction. 490 U.S. at 827, 109 S.Ct. 2218. Newman-Green, an Illinois corporation, brought a contract action in federal court against a Venezuelan corporation, four Venezuelan citizens, and William L. Betti-son, a United States citizen domiciled in Venezuela. Id. at 828, 109 S.Ct. 2218. The district court granted partial summary judgment against Newman-Green and an appeal followed. Id. On appeal, the Seventh Circuit sua sponte raised the issue of *171statutory jurisdiction, i.e., that jurisdiction did not exist under 28 U.S.C. § 1332(a)(2) or (3) because Bettison was a citizen of the United States, but not of any state, and therefore the suit was not either solely against aliens or against aliens and diverse citizens. Id. The panel concluded, however, that Bettison was a dispensable party, and could be dismissed to perfect statutory jurisdiction. Id. at 829, 109 S.Ct. 2218. The Supreme Court agreed. While recognizing the rule that “[t]he existence . of federal jurisdiction ordinarily depends on facts as they exist when the complaint is filed,” the Court held that, “[ljike most general principles ... this one is susceptible to exceptions.” Id. at 830. The court concluded that a circuit court’s power to dismiss a party pursuant to Rule 21 was one such exception. Id. at 837, 109 S.Ct. 2218.
Although Newman-Green is distinguishable because Rule 21 is not at issue in the case before us, we find its underlying policy theme instructive. The Court in Newman-Green stressed that “requiring dismissal after years of litigation would impose unnecessary and wasteful burdens on the parties, judges, and other litigants waiting for judicial attention.” Id. at 836, 109 S.Ct. 2218. It is this rationale that persuaded the Court in Newman-Green and again in Caterpillar. ■
B. Caterpillar
In Caterpillar, James David Lewis commenced a civil action in state court against Caterpillar and Whayne Supply. 519 U.S. at 64-65, 117 S.Ct. 467. Lewis and Whayne Supply were both citizens of Kentucky. Id. Subsequently, Liberty Mutual intervened as a plaintiff, asserting subro-gation claims against both Caterpillar and Whayne Supply. Id. at 65, 117 S.Ct. 467. After Lewis settled with Whayne Supply, Caterpillar removed the action, asserting diversity jurisdiction. Id. Lewis moved for remand, contending correctly that there was not complete diversity because Liberty Mutual’s claims against Whayne Supply kept it in the suit. Id. at 65-66, 117 S.Ct. 467. The district court erroneously denied the motion. Prior to trial, Liberty Mutual settled with Whayne Supply. Id. at 66, 117 S.Ct. 467. The action proceeded to trial, resulting in a judgment for Caterpillar. Id. at 66-67, 117 S'.Ct. 467. The Sixth Circuit reversed, concluding that the error of the court in failing to remand made it necessary to vacate the district court judgment. Id. at 67, 117 S.Ct. 467.
The Supreme Court reversed the Sixth Circuit, effectively reinstating the jury verdict. Id. at 78,117 S.Ct. 467. The Court held that a “district court’s error in failing to remand a case improperly removed is not fatal to the ensuing adjudication if federal jurisdiction requirements are met at the time judgment is entered.” Id. at 64,117 S.Ct. 467; see also Howery v. Allstate Ins. Co., 243 F.3d 912, 916 & n. 5 (5th Cir.2001) (citing Caterpillar for this proposition); H&D Tire & Automotive-Hardware, Inc. v. Pitney Bowes, Inc., 227 F.3d 326, 328 (5th Cir.2000) (same). Addressing the jurisdictional problem specifically, the Court provided that any “jurisdictional defect was cured, i.e., complete diversity was established before the trial commenced. Therefore the Sixth Circuit erred in resting its decision on the absence of subject-matter jurisdiction.” Caterpillar, 519 U.S. at 73, 117 S.Ct. 467; accord Grubbs v. Gen. Elec. Credit Corp., 405 U.S. 699, 700, 92 S.Ct. 1344, 31 L.Ed.2d 612 (1972) (holding that an erroneous removal need not cause destruction of final judgment if requirements of subject matter jurisdiction are satisfied when judgment is entered).
*172The Supreme Court then addressed the still-existing statutory problem — the fact that when the action was removed, it was not removable pursuant to 28 U.S.C. § 1441(a) (1994). The question remaining was whether this error, which lurked “in the unerasable history of the case,” required reversal of the district court. Caterpillar, 519 U.S. at 73, 117 S.Ct. 467. The Court concluded that although arguments could be made for reversal on this ground, these arguments failed because they “run up against an overriding consideration. Once a diversity case has been tried in federal court, with rules of decision supplied by state law under the regime Erie R.R. Co. v. Tompkins, 304 U.S. 64, 58 S.Ct. 817, 82 L.Ed. 1188 (1938) ..., considerations of finality, efficiency, and economy become overwhelming.” Id. at 75, 77, 117 S.Ct. 467 (“To wipe out the adjudication postjudgment, and return to state court a case now satisfying all federal jurisdictional requirements, would impose an exorbitant cost on our dual court system, a cost incompatible with the fair and unprotract-ed administration of justice.”); see also Knop v. McMahan, 872 F.2d 1132, 1139 n. 16 (3d Cir.1989) (“To permit a case in which there is complete diversity throughout trial to proceed to judgment and then cancel the effect of that judgment and relegate the parties to a new trial in a state court because of a brief lack of complete diversity at the beginning of the case would be a waste of judicial resources. It would also encourage litigants to speculate on the jurisdiction issue by saving it for use in the event of a loss.”).
While considerations of finality and judicial economy come into play “[o]nce a diversity case has been tried in federal court,” the Court’s holding in Caterpillar references the fact that judgment had already been entered. 519 U.S. at 64, 75, 117 S.Ct. 467. Although Dataflux moved for dismissal before the trial court entered judgment, the analysis in Caterpillar compels a conclusion that its exception covers the facts of this case. Caterpillar does not hold that there must always be entry of judgment for an exception to the rule to apply. It merely holds that judgment is sufficient. See In re AT&T Fiber Optic Cable Installation Litig., No. IP 99-9313-C H/K, 2001 WL 1397295, at *5-7 (S.D.Ind. Nov. 5, 2001) (concluding that Caterpillar does not make judgment a prerequisite and stating that “the reasoning of [Caterpillar] extends to district courts even before the formal entry of final judgment. Suppose, for example, that [the] plaintiff [in Caterpillar] first raised the issue after an adverse verdict at trial, but before the judge had actually entered final judgment. Surely the result would be the same — no remand”). Here, the only thing left for the district court to do was enter judgment. It is difficult to distinguish a case where judgment has been entered from a case where nothing is left for the court to do other than enter judgment.
Dataflux’s attempts to distinguish Caterpillar are not persuasive. First, Dataflux asserts that unlike in Caterpillar, jurisdiction was not cured through a dismissal of a party — it was cured through a unilateral change in citizenship effectuated through a reorganization. Second, it contends that this case was not removed but instead was originally filed in federal court. Finally, it asserts that Nevmarir-Green is distinguishable because it dealt with Rule 21.
1. Method of Perfecting Jurisdiction
As to the first ground, Dataflux argues that Caterpillar does not apply in a case where a party has not been dismissed, but instead statutory diversity jurisdiction is perfected by a “unilateral change” in citizenship. While a party was dismissed in Caterpillar, and this is perhaps technically *173a distinguishing factor, this factor was not at the heart of the Supreme Court’s analysis in Caterpillar and Dataflux does not persuasively explain its import. Dataflux opines that extending the exception to cases where jurisdiction was perfected through a unilateral change of domicile would defeat the purpose of the general rule. According to Dataflux, such a rule would require the district court to reevaluate the existence of diversity jurisdiction in each instance in which a party changed its domicile. We recognize that the rule that diversity jurisdiction is determined solely at the outset of the litigation exists precisely to prevent the district court from having to make such determinations. 13B CHARLES ALAN WRIGHT ET AL., FEDERAL PRACTICE AND ProCedure § 3608 (2d ed.1984). However, our holding today has only a slightly greater effect on the general rule than would the strictest construction of Caterpillar. As in the Caterpillar case, a district judge would only have to reevaluate jurisdiction when it is challenged after a verdict or dispositive ruling. If a party re-organized before this point and jurisdiction were challenged, the general rule would be applied and the reorganization would be of no effect.
2. Removed Cases vs. Original Federal Forum Cases
Dataflux also focuses on the fact that Caterpillar dealt with a removed case and that this action was originally filed in federal court. The only authority cited by Dataflux in support of its position that the fact that Caterpillar involved a removal action is a controlling distinguishing factor is Saadeh v. Farouki, 107 F.3d 52 (D.C.Cir.1997). In Saadeh, the D.C. Circuit distinguished its case from Caterpillar on the remand ground, concluding that “[although we are mindful of the ‘considerations of finality, efficiency and economy’ that concerned the Supreme Court in Caterpillar, those concerns in the removal context are insufficient to warrant a departure here from the bright-line rule that citizenship and domicile must be determined as of the time a complaint is filed.” Id. at 57. Because Saadeh does not provide any analytical justification for its conclusion that removal cases deserve differential treatment, we find it unpersuasive.
Dataflux opines that removal cases are different because removal is subject to judicial control, which decreases the likelihood of jurisdictional manipulation. However, district courts always have a duty to examine jurisdiction regardless of whether a case is removed or was originally filed in the district court. Save The Bay, Inc. v. U.S. Army, 639 F.2d 1100, 1102 (5th Cir.1981) (“[I]t is incumbent upon federal courtsf,] trial and appellate[,] to constantly examine the basis of jurisdiction, doing so on our own motion if necessary.”). Furthermore, we find it difficult to imagine that plaintiffs who cannot establish federal jurisdiction will intentionally file an action in federal court in the hope that neither the judge nor the defendant raises the issue, knowing that at any point before a verdict or dispositive ruling, the court or defendants could raise the issue and the case would be dismissed.
We conclude that the exception carved out in Caterpillar applies under the circumstances of this case. The decision in Caterpillar was not limited to removal cases. Undoubtedly, if the Supreme Court had found this to be a dispositive factor, it would have spoken to the issue. The same is true of Dataflux’s argument that Newman-Green’s rationale is limited to dismissals pursuant to Rule 21. While it is accurate to describe these cases as removal and Rule 21 cases, respectively, there is nothing that persuades us that the principle of these cases is limited to only the exact same procedural scenarios. See C.L. *174Ritter Lumber Co., Inc. v. Consolidation Coal Co., 283 F.3d 226, 229-230 (4th Cir.2002) (holding that the district court could, post-trial, split a suit into two separate cases to cure a jurisdictional defect and stating that “[t]he specific nature of the remedy implicates the discretion of the court, not its power to act”).
In the instant case, this dispute has been completely adjudicated by a federal district court, which had jurisdiction over the parties throughout the trial and at the time the jury rendered its verdict of $750,000 in favor of Atlas. The parties and the court have committed ample resources to its adjudication. They have had the benefit of a full assessment of the evidence by an impartial jury during a six-day trial. To erase the result of that process by requiring them to re-litigate their claims in state court, or likely in federal court, is not necessary under Caterpillar. In so concluding, we remain aware of the limited nature of the district court’s jurisdiction and the ’ Supreme Court’s caveat against improper expansion of federal jurisdiction. However, this narrow exception applies only where (1) an action is filed or removed when constitutional and/or statutory jurisdictional requirements are not met, (2) neither the parties nor the judge raise the error until after a jury verdict has been rendered, or a dispositive ruling has been made by the court, and (3) before the verdict is rendered, or ruling is issued, the jurisdictional defect is cured. If at any point prior to the verdict or ruling, the issue is raised, the court must apply the general rule and dismiss regardless of subsequent changes in citizenship.
CONCLUSION
For the reasons stated herein, we REVERSE and REMAND with instructions to the district court to enter judgment in favor of Atlas.
REVERSED and REMANDED.