Original commit message from CVS:
Added some caps != NULL checks.
Patched up a problem with the thread handling when the iteration fails.
Cleaned up the output of -inspect a tiny bit.