Pointwatch - more assertion protection