Removed unnecessary error handling