Fix NPE I saw in my dev environment