Merge pull request #3 from starteam/develop

NullPointerException fixes for tooltip and drag from an empty mating site
Merge branch 'develop'

* develop:
  Minor Peas update