Poller upgrade bug-fix for NullPointer