One Step Beyond

The Stranger (3x22)

:

In a disaster, he comforts the survivors, and afterward is found to have died in prison some time before.