Adding removed nil checks for notification userInfo