Added calls to validate in commandhandler