Fix polymorphic extract if no payload

Scumbag Brad