Removed unneeded error checking code