Fixed nullpointer when polling client and it returns null target.
Merge branch 'master' into better-client

npe fix