Fix some NPEs
Data