Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev