Fix no-return problem, errorless