Solved What is The Title of Another Nuclear Terrorism Film? Note, Spoilers

This film has as part of the plot a Russian General stealing nuclear bombs. At some point he has a train transporting some nuclear bombs exploding while he hides with one or two nuclear bombs in a tunnel in another train. As part of the explosion a farmer and his wife hear the fake train accident and start going to the site of the fake accident then you see the nuclear explosion triggered by the rogue General. The nuclear explosion is done so the crime scene, the robbery, is obliterated.

At some point I believe a bomb ends up in New York City where a team traces it to a Catholic school, and disarm it by removing one of the explosive triangles that would have initiated the nuclear explosion. Or am I mixing two movies here?