Further refactoring of nodename checks; went back to IdException for errors