Add a run-time check to ensure that the previous bug never happens again...