Added retry if command polling throws exception