Add is_supported_* checks for better error handling
#4687
Loading
is_supported_* checks for better error handling
#4687