Merge "Guard against NPE" into sc-dev