Fixed null pinter stuff