Make maintenance of diagnostics a little more generic and add connection errors diagnostic cleanup
Merge pull request #183 from maciejmrowiec/master

Make maintenance of diagnostics a little more generic and add connection...