Add argument check logic (#1009)