FW: LS Notififications: Fix NPE

PS: Update author

Change-Id: I8cd547abf384098aa33d53312815f84cd3ee6479