A null check fix to the previous commit
A null check fix to the previous commit

Bramas/Lychee,windhamdavid/Lychee,Zix17/Lychee,electerious/Lychee,windhamdavid/Lychee,Bramas/Lychee,Zix17/Lychee,electerious/Lychee,electerious/Lychee,windhamdavid/Lychee,Bramas/Lychee,Zix17/Lychee