be more resilient of registration and data source connection errors