Better handling of invalid descriptors.