Return when punishment expiry fails due to unknown type, and add a TODO