Improvements in Exception Handling, Retry added, just unit tests and doc left.