Make maintenance of diagnostics a little more generic and add connection errors diagnostic cleanup