More armouring against edge-cases.