fixing npe, do not draw markers if new hunt
merging Shantanu's changes to local. Merge remote-tracking branch 'origin/master'

* origin/master:
  Merge fixes