Merge "Attemp to fix an NPE while transferStartingWindow."