I found the reason for the last crash caused by the PROTOS
testsuite, turns out to be annoyingly simple for the amount
of time I needed to find it.

Please review these two patches, we need to get this fixed
before 2.6.17.