Error check (24/31)

Error check