Fix a NPE.  I should run my tests before I commit.