fix enotice with early return