Romancing McShep

Does anyone remember Jumping Jack Flash with Whoopi Goldberg? Sort of a slapstick spy thriller, where her character stumbles across a British spy (Knock knock appears on her screen and she is intrigued) being chased by the KGB and she becomes embroiled in getting him the 'code' so he can escape? Simplify the plot a bit, and have John trapped on a planet and Rodney at a university (and instead of the embassy, he has to break into area 51!) and the Trust involved, and well... It kind of writes itself, doesn't it? :)