Better handling of unsupported class/frame combinations