Continued enhancements on connector and exception handling.