Fix wierd mac bug with return statements argument being null