More checks for ActiveWayPoint++
Fix minor GDI leak
More check on ActiveWayPoint