Updated a load of invalid argument exceptions