Fix NPE during polling