fixed issue were versions were clear when the should be due to a missing try finally. Wrapped trace in if (LOG.isTraceEn... Added a retrying callback stream