Handling of CompletionExceptions fixed.