PollSynchronizer code refactor and error handling addition