Merge "Add null check for notifEntry's repEntry"