Add more invalid arg checks