Nil safety now a window can be nil when closing

Nil safety now a window can be nil when closing #5774