Bug fix: a return stmt may have no return value