Error checking (6/28)

Error checking