IDEX-679 : avoid NPE
Merge pull request #17 from benoitf/IDEX-679

IDEX-679 : avoid NPE