Fix an NPE.

Signed-off-by: tianyuli <tli@wpi.edu>
Merge branch 'team1-tablevalidate' of github.com:cmdunkers/wpi-suite-tng into team1-tablevalidate
Merge branch 'team1-tablevalidate' of github.com:cmdunkers/wpi-suite-tng into team1-tablevalidate