NPE fix on window tool