Better handling of misparsed nodes