Merge "Fix NPE" into sc-dev