properly short circuit note resolution with return