remove NodeErrorWrap
add node generation hook