Fix exception case in null return