Pointwatch - more assertion protection
Merge pull request #784 from Windower/4.1-dev

Pointwatch - more assertion protection