Fix null pointer exception.

Screenovate-Feature-Id: nec-modifications
Change-Id: I8f643fd245b6a71a5879aaad9586ab2744e0a6c1