Fix the NPE that I knew was bound to happen.