Error check (2/31)

Error check