1) sync with Engine

2) removed duplicate null check