FORGE-1748 - Fix potential NPE