Added Exception and InvalidArgumentException