Added InvalidArgument exception