Merge "Remove an NPE in tearDown" into main