Better handling of invalid descriptors.
Merge branch 'jortel-1115631'