removed unnecessary error handling