Add a guard clause to ResponseNewWindow