Error check (22/31)

Error check