Remove bitmap hunter warnings and unneccesary checks

redundant null check since we already checked on line 244.