Remove exception (todo think when exception should be thrown)