Stop InvalidTokenException being thrown for null payload