Error check (5/31)

Error check