Fixed another null reference exception