EV: fix possible nullpointer access in last commit.