Error checking (8/28)

Error checking