bumped forge to latest and more null checking