Removed unnecessary exception raising