Added command parameter checks