Improved Exception Handling for Data Source connectivity