FORGE-1935: checking possible NPEs