Fix NPEs and add some help