Added some missing validation statements.