Add error-checking for padding token, and update validation loss to u…

Add error-checking for padding token, and update validation loss to u… #6884