Fixed possible null value
Merge branch '2.0'