I read a biography of Father Damien years ago and saw the movie version a couple of years back. If I recall, it was quite a while before he actually got the disease. What a selfless man...
I think you are right.