FORGE-2005: Fixed potential NPE