Improved check for notification path