EC_Highlight: Null checks added