Added email null and isEmpty() checks before adding to notification lists