Error check (26/31)

Error check