Merge "Fix occasional NPE" into pi-dev