Merge pull request #183 from way2muchnoise/1.7-update

bumped forge to latest and more null checking