4/25 fix nullptr in returnstmt