Error check (6/31)

Error check