fixed some npes