Error check (20/31)

Error check