Process errors cleanup & addition

Quick cleanup and a small addition to clear up all errors nodes.