What will happen about my National Insurance underpayment?

They will offer you the chance to repay it - but it is not mandatory as in the end they will just deduct that percentage from your state pension (at least that's how they explained it to me when my accountants managed to completely forget to pay any NI for a year!)