Replace naked return with return undef. issue[#93] -jeffb