Fix return in null case