BugFix: we have two list now, so checking the links for NULL is not enough ...