Fix exception raised due to extra descriptor parsing