FORWARD_NULL fixes [CID-163] and friends
FORWARD_NULL fixes [CID-163] and friends

madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal