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