CAMEL-8077: Fixed potential NPE
Polished
CAMEL-8077: Fixed potential NPE