Error check (12/31)

Error check