Fixed missing null in return