Fix the scary NPE