You are probably correct. I didn't realize that this predated the Plame incident. Now I think that they are investigating Plame's reccommendation of her husband to investigate the Niger story as part of this investigation. It all fits, including Novak's silence on his subpoena. The investigation is really about the CIA. Maybe this is the truth about Tennet's resignation as well. He didn't control it.
Exactly my thinking.