Remove getArity() and Fix NPE on user input