Added retry if notification polling throws exception