Merge "[AAPM} Catch exceptions thrown by AdvancedProtectionHooks." into main