extra: fix some error pointer handling