Make misparsed node handling a bit smarter