Removed unnecessary error catching