Finish exception handling in AdapterRegistry2