fixed some null camper issues