Code review, removed node exception handling