Added validation to Command #19