Removed extra error checking