In Japan, visiting Hiroshima and Nagasaki, Pope Francis made three key points regarding nuclear weapons and nuclear energy. He declared the use of nuclear weapons immoral; the possession of nuclear weapons immoral; and endorsed the call of the Japanese bishops to eliminate the use of nuclear energy. The three points were not a surprise, especially the first. But the implementation of the second and third raise issues that challenge the history of non-proliferation efforts.