Correct accessor so that it doesn't cause a NPE