Moved error checking to Toby's code for modurataltiaetiaoetnmo