Error check (8/31)

Error check