v5.8.58 - fix another NPE