Fix NPE condition. Update notification regex rules.
Line termination adjusted