Merge "Add additional exception handling in endpoint callback registration" into main