Fix NPE introduced by last change