Another (hopefully final) fix to an NPE on line 44