Replace return null with return