Error checking (3/28)

Error checking