Error check (4/31)

Error check