Fixed adding back inadvertently removed terms validation.

Closes Bug 636.

Change-Id: If24a6b95bfd640d490bd00857dd56459721e59f7