Merge "Add null-check when adding starting window"