FORGE-1891: Added null check