got rid of extra error checking: