Notify: Add NULL check for robustness